]> https://gitweb.dealii.org/ - dealii.git/commitdiff
More fixes.
authordeal <deal@0785d39b-7218-0410-832d-ea1e28bc413d>
Thu, 4 Mar 2004 16:15:22 +0000 (16:15 +0000)
committerdeal <deal@0785d39b-7218-0410-832d-ea1e28bc413d>
Thu, 4 Mar 2004 16:15:22 +0000 (16:15 +0000)
git-svn-id: https://svn.dealii.org/trunk@8658 0785d39b-7218-0410-832d-ea1e28bc413d

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

index f059d9033370c8ec3ecd17dffb516582bb0f90a9..eb8761a8ee97c781f03f8bdcabf90d551c9e9236 100644 (file)
@@ -704,7 +704,7 @@ class DataOut_DoFData : public DataOutInterface<patch_dim,patch_space_dim>
                                      */
     template <int,int,int> friend class DataOut_DoFData;
 
-#ifdef DEAL_II_CHECK_NESTED_CLASS_FRIEND_BUG
+#ifdef DEAL_II_NESTED_CLASS_FRIEND_BUG
                                      /**
                                       * Make DataEntry a friend. This should
                                       * not be strictly necessary, since
@@ -714,8 +714,15 @@ class DataOut_DoFData : public DataOutInterface<patch_dim,patch_space_dim>
                                       * DataEntry can't derive from
                                       * 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...
                                       */
-    template <typename> friend class DataEntry;
+    template <int N1, int N2, int N3>
+    template <typename>
+    friend class DataOut_DoFData<N1,N2,N3>::DataEntry;
 #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.