From: bangerth Date: Fri, 29 Dec 2006 18:59:19 +0000 (+0000) Subject: Properly qualify names of classes that we want to make a friend. X-Git-Url: https://gitweb.dealii.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=9f035bea9a2a0dcf26e83019b144a1f5383c88fd;p=dealii-svn.git Properly qualify names of classes that we want to make a friend. git-svn-id: https://svn.dealii.org/trunk@14285 0785d39b-7218-0410-832d-ea1e28bc413d --- diff --git a/deal.II/base/include/base/symmetric_tensor.h b/deal.II/base/include/base/symmetric_tensor.h index 3ac46b78c5..be480252ff 100644 --- a/deal.II/base/include/base/symmetric_tensor.h +++ b/deal.II/base/include/base/symmetric_tensor.h @@ -125,7 +125,7 @@ namespace internal template struct double_contraction_result { - typedef SymmetricTensor type; + typedef ::dealii::SymmetricTensor type; }; @@ -248,7 +248,7 @@ namespace internal template struct AccessorTypes { - typedef const SymmetricTensor tensor_type; + typedef const ::dealii::SymmetricTensor tensor_type; typedef double reference; }; @@ -265,7 +265,7 @@ namespace internal template struct AccessorTypes { - typedef SymmetricTensor tensor_type; + typedef ::dealii::SymmetricTensor tensor_type; typedef double &reference; }; @@ -399,7 +399,7 @@ namespace internal template friend class Accessor; # ifndef DEAL_II_TEMPL_SPEC_FRIEND_BUG - friend class SymmetricTensor; + friend class ::dealii::SymmetricTensor; friend class Accessor; # endif #else @@ -516,10 +516,10 @@ namespace internal #ifndef DEAL_II_NAMESP_TEMPL_FRIEND_BUG template friend class SymmetricTensor; template - friend class Accessor; + friend class SymmetricTensorAccessors::Accessor; # ifndef DEAL_II_TEMPL_SPEC_FRIEND_BUG - friend class SymmetricTensor; - friend class Accessor; + friend class ::dealii::SymmetricTensor; + friend class SymmetricTensorAccessors::Accessor; # endif #else friend class SymmetricTensor;