]> https://gitweb.dealii.org/ - dealii-svn.git/commitdiff
Remove some cruft from pre-2.95 times, and declare the proper classes friends.
authorwolf <wolf@0785d39b-7218-0410-832d-ea1e28bc413d>
Tue, 26 Mar 2002 08:11:03 +0000 (08:11 +0000)
committerwolf <wolf@0785d39b-7218-0410-832d-ea1e28bc413d>
Tue, 26 Mar 2002 08:11:03 +0000 (08:11 +0000)
git-svn-id: https://svn.dealii.org/trunk@5623 0785d39b-7218-0410-832d-ea1e28bc413d

deal.II/deal.II/include/grid/tria.h

index d0a1ff7d6e5c00735ad048e8d702e3387508e17e..452c6fdabd8072ce671f70319447c37e9c5f9271 100644 (file)
@@ -3232,25 +3232,17 @@ class Triangulation : public TriaDimensionInfo<dim>,
                                      * an optimal solution.
                                      */
     TriaNumberCache<dim>             number_cache;
-    
-                                    // Friendship includes local classes.
-#if (__GNUC__==2) && (__GNUC_MINOR__ < 95)
-                                    // this seems to be disallowed
-                                    // by the standard, so gcc2.95
-                                    // does not accept it
-    friend class TriaAccessor<dim>;
-    friend class TriaObjectAccessor<1, dim>;
-    friend class TriaObjectAccessor<2, dim>;
-    friend class TriaObjectAccessor<3, dim>;
-#else
-                                    // this, however, may grant
-                                    // access to too many classes,
-                                    // but ...
+
+                                    // make a couple of classes
+                                    // friends
     template <int dim1> friend class TriaAccessor;
 
     template <int dim1, int dim2>
     friend class TriaObjectAccessor;
-#endif
+    
+    template <int N> friend class TriaObjectAccessor<1, N>;
+    template <int N> friend class TriaObjectAccessor<2, N>;
+    template <int N> friend class TriaObjectAccessor<3, N>;
     
     friend class CellAccessor<dim>;
     

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.