From: maier Date: Fri, 28 Sep 2012 15:31:02 +0000 (+0000) Subject: Remove workarounds for DEAL_II_NAMESP_TEMPL_FRIEND_BUG from the source X-Git-Url: https://gitweb.dealii.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=3f12b88baa797db7f897bc28865061a96efd253a;p=dealii-svn.git Remove workarounds for DEAL_II_NAMESP_TEMPL_FRIEND_BUG from the source git-svn-id: https://svn.dealii.org/branches/branch_cmake@26842 0785d39b-7218-0410-832d-ea1e28bc413d --- diff --git a/deal.II/include/deal.II/base/symmetric_tensor.h b/deal.II/include/deal.II/base/symmetric_tensor.h index 39c626880e..a190398a65 100644 --- a/deal.II/include/deal.II/base/symmetric_tensor.h +++ b/deal.II/include/deal.II/base/symmetric_tensor.h @@ -407,7 +407,6 @@ namespace internal // as friends. make sure to // work around bugs in some // compilers -#ifndef DEAL_II_NAMESP_TEMPL_FRIEND_BUG template friend class SymmetricTensor; template friend class Accessor; @@ -415,10 +414,6 @@ namespace internal friend class ::dealii::SymmetricTensor; friend class Accessor; # endif -#else - friend class SymmetricTensor; - friend class Accessor; -#endif }; @@ -526,7 +521,6 @@ namespace internal // as friends. make sure to // work around bugs in some // compilers -#ifndef DEAL_II_NAMESP_TEMPL_FRIEND_BUG template friend class SymmetricTensor; template friend class SymmetricTensorAccessors::Accessor; @@ -534,10 +528,6 @@ namespace internal friend class ::dealii::SymmetricTensor; friend class SymmetricTensorAccessors::Accessor; # endif -#else - friend class SymmetricTensor; - friend class Accessor; -#endif }; } } diff --git a/deal.II/include/deal.II/base/table.h b/deal.II/include/deal.II/base/table.h index 531226662a..051f680bf4 100644 --- a/deal.II/include/deal.II/base/table.h +++ b/deal.II/include/deal.II/base/table.h @@ -223,7 +223,6 @@ namespace internal // as friends. make sure to // work around bugs in some // compilers -#ifndef DEAL_II_NAMESP_TEMPL_FRIEND_BUG template friend class dealii::Table; template friend class Accessor; @@ -231,10 +230,6 @@ namespace internal friend class dealii::Table; friend class Accessor; # endif -#else - friend class Table; - friend class Accessor; -#endif }; @@ -374,7 +369,6 @@ namespace internal // as friends. make sure to // work around bugs in some // compilers -#ifndef DEAL_II_NAMESP_TEMPL_FRIEND_BUG template friend class dealii::Table; template friend class Accessor; @@ -382,10 +376,6 @@ namespace internal friend class dealii::Table<2,T>; friend class Accessor; # endif -#else - friend class Table<2,T>; - friend class Accessor; -#endif }; } diff --git a/deal.II/include/deal.II/lac/block_matrix_base.h b/deal.II/include/deal.II/lac/block_matrix_base.h index 8f68491ec6..2e3cecf83c 100644 --- a/deal.II/include/deal.II/lac/block_matrix_base.h +++ b/deal.II/include/deal.II/lac/block_matrix_base.h @@ -1237,20 +1237,11 @@ class BlockMatrixBase : public Subscriptor * friend. We have to work around * a compiler bug here again. */ -#ifndef DEAL_II_NAMESP_TEMPL_FRIEND_BUG template friend class BlockMatrixIterators::Accessor; template friend class MatrixIterator; -#else - typedef BlockMatrixIterators::Accessor ConstAccessor; - typedef BlockMatrixIterators::Accessor Accessor; - friend class ConstAccessor; - - friend class const_iterator; -#endif - }; diff --git a/deal.II/include/deal.II/lac/block_vector_base.h b/deal.II/include/deal.II/lac/block_vector_base.h index f5f3aaecbc..33039ec2f1 100644 --- a/deal.II/include/deal.II/lac/block_vector_base.h +++ b/deal.II/include/deal.II/lac/block_vector_base.h @@ -645,7 +645,6 @@ namespace internal void move_backward (); -#ifndef DEAL_II_NAMESP_TEMPL_FRIEND_BUG /** * Mark all other instances of * this template as friends. In @@ -653,19 +652,10 @@ namespace internal * inverse constness iterator * as friend, but this is * something that ISO C++ does - * not allow to specify. If we - * have detected a compiler bug - * during configuration of the - * library, use a workaround - * that works for this - * particular compiler, but is - * not ISO C++ conforming. + * not allow to specify. */ template friend class Iterator; -#else - friend class InverseConstnessIterator; -#endif }; } // namespace BlockVectorIterators } // namespace internal @@ -1165,16 +1155,10 @@ class BlockVectorBase : public Subscriptor /** * Make the iterator class a - * friend. We have to work around - * a compiler bug here again. + * friend. */ -#ifndef DEAL_II_NAMESP_TEMPL_FRIEND_BUG template friend class dealii::internal::BlockVectorIterators::Iterator; -#else - friend class iterator; - friend class const_iterator; -#endif template friend class BlockVectorBase; };