]> https://gitweb.dealii.org/ - dealii-svn.git/commitdiff
Work around nasty problems with gcc 2.95.
authorwolf <wolf@0785d39b-7218-0410-832d-ea1e28bc413d>
Mon, 8 Mar 2004 16:11:00 +0000 (16:11 +0000)
committerwolf <wolf@0785d39b-7218-0410-832d-ea1e28bc413d>
Mon, 8 Mar 2004 16:11:00 +0000 (16:11 +0000)
git-svn-id: https://svn.dealii.org/trunk@8676 0785d39b-7218-0410-832d-ea1e28bc413d

deal.II/deal.II/include/numerics/data_out.h

index eb8761a8ee97c781f03f8bdcabf90d551c9e9236..b35685178c49d9d7cd8676e121169baae4ff41d0 100644 (file)
@@ -715,14 +715,19 @@ class DataOut_DoFData : public DataOutInterface<patch_dim,patch_space_dim>
                                       * DataEntryBase since the latter is a
                                       * private member of DataOut_DoFData.
                                      *
-                                     * For whatever weird reason, it
-                                     * is also not enough to make
-                                     * just DataEntry a friend, but
-                                     * we have to fully qualify it...
+                                     * For whatever weird reason, it is also
+                                     * not enough to make just DataEntry a
+                                     * friend, but we have to fully qualify
+                                     * it for icc, while gcc 2.95 insists on
+                                     * the non-qualified version...
                                       */
+#  ifdef DEAL_II_NESTED_CLASS_TEMPL_FRIEND_BUG
+    template <typename> friend class DataEntry;
+#  else
     template <int N1, int N2, int N3>
     template <typename>
     friend class DataOut_DoFData<N1,N2,N3>::DataEntry;
+#  endif
 #endif
 };
 

In the beginning the Universe was created. This has made a lot of people very angry and has been widely regarded as a bad move.

Douglas Adams


Typeset in Trocchi and Trocchi Bold Sans Serif.