]> https://gitweb.dealii.org/ - dealii-svn.git/commitdiff
Remove workarounds for DEAL_II_NESTED_CLASS_FRIEND_BUG from the source
authormaier <maier@0785d39b-7218-0410-832d-ea1e28bc413d>
Fri, 28 Sep 2012 15:31:13 +0000 (15:31 +0000)
committermaier <maier@0785d39b-7218-0410-832d-ea1e28bc413d>
Fri, 28 Sep 2012 15:31:13 +0000 (15:31 +0000)
git-svn-id: https://svn.dealii.org/branches/branch_cmake@26843 0785d39b-7218-0410-832d-ea1e28bc413d

deal.II/include/deal.II/grid/filtered_iterator.h
deal.II/include/deal.II/lac/sparse_matrix.h
deal.II/include/deal.II/lac/sparse_matrix_ez.h

index 895c407bd0b6ab91ce1a08fb59b69d74796292b6..37f1a729693904f5471c7f740c4b31b0a5c26224 100644 (file)
@@ -745,15 +745,6 @@ class FilteredIterator : public BaseIterator
                                       */
     const PredicateBase * predicate;
 
-#ifdef DEAL_II_NESTED_CLASS_FRIEND_BUG
-#  ifdef DEAL_II_NESTED_CLASS_TEMPL_FRIEND_BUG
-    template <typename> friend class PredicateTemplate;
-#  else
-    template <typename T>
-    template <typename>
-    friend class FilteredIterator<T>::PredicateTemplate;
-#  endif
-#endif
 };
 
 
index caf2c445bb4d113c682650128da8f727d5784a76..f9217a8a50623bb9234a8095d43642245932d236 100644 (file)
@@ -332,9 +332,6 @@ namespace SparseMatrixIterators
                                         * friend if the compiler has a bug
                                         * and requires this.
                                         */
-#ifdef DEAL_II_NESTED_CLASS_FRIEND_BUG
-      friend class Reference;
-#endif
   };
 
 
index ca0742ff546b2c758c78b49fa84092fb278ad25e..f921bc08054ad425b8bd4bdbbb1b8a0999df2c5e 100644 (file)
@@ -319,9 +319,6 @@ class SparseMatrixEZ : public Subscriptor
                                           * class being granted
                                           * friendship...
                                           */
-#ifdef DEAL_II_NESTED_CLASS_FRIEND_BUG
-        template <typename> friend class SparseMatrixEZ;
-#endif
     };
 
                                      /**
@@ -1077,10 +1074,6 @@ class SparseMatrixEZ : public Subscriptor
                                       * standard, but some compilers
                                       * require this...
                                       */
-#ifdef DEAL_II_NESTED_CLASS_FRIEND_BUG
-    friend class const_iterator;
-    friend class const_iterator::Accessor;
-#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.