From 19a9cff03ec9adb3d678545116eeddaaf2744913 Mon Sep 17 00:00:00 2001 From: maier Date: Fri, 28 Sep 2012 15:31:13 +0000 Subject: [PATCH] Remove workarounds for DEAL_II_NESTED_CLASS_FRIEND_BUG from the source 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 | 9 --------- deal.II/include/deal.II/lac/sparse_matrix.h | 3 --- deal.II/include/deal.II/lac/sparse_matrix_ez.h | 7 ------- 3 files changed, 19 deletions(-) diff --git a/deal.II/include/deal.II/grid/filtered_iterator.h b/deal.II/include/deal.II/grid/filtered_iterator.h index 895c407bd0..37f1a72969 100644 --- a/deal.II/include/deal.II/grid/filtered_iterator.h +++ b/deal.II/include/deal.II/grid/filtered_iterator.h @@ -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 friend class PredicateTemplate; -# else - template - template - friend class FilteredIterator::PredicateTemplate; -# endif -#endif }; diff --git a/deal.II/include/deal.II/lac/sparse_matrix.h b/deal.II/include/deal.II/lac/sparse_matrix.h index caf2c445bb..f9217a8a50 100644 --- a/deal.II/include/deal.II/lac/sparse_matrix.h +++ b/deal.II/include/deal.II/lac/sparse_matrix.h @@ -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 }; diff --git a/deal.II/include/deal.II/lac/sparse_matrix_ez.h b/deal.II/include/deal.II/lac/sparse_matrix_ez.h index ca0742ff54..f921bc0805 100644 --- a/deal.II/include/deal.II/lac/sparse_matrix_ez.h +++ b/deal.II/include/deal.II/lac/sparse_matrix_ez.h @@ -319,9 +319,6 @@ class SparseMatrixEZ : public Subscriptor * class being granted * friendship... */ -#ifdef DEAL_II_NESTED_CLASS_FRIEND_BUG - template 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 }; /*@}*/ -- 2.39.5