From: Wolfgang Bangerth Date: Tue, 24 Jan 2006 07:34:03 +0000 (+0000) Subject: Move friend declarations all into the same place. X-Git-Tag: v8.0.0~12532 X-Git-Url: https://gitweb.dealii.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=c3813c0ec102bf529448c11de34de98bf58569ff;p=dealii.git Move friend declarations all into the same place. git-svn-id: https://svn.dealii.org/trunk@12143 0785d39b-7218-0410-832d-ea1e28bc413d --- diff --git a/deal.II/deal.II/include/fe/fe.h b/deal.II/deal.II/include/fe/fe.h index c1749d2daa..ef61097ec2 100644 --- a/deal.II/deal.II/include/fe/fe.h +++ b/deal.II/deal.II/include/fe/fe.h @@ -1898,30 +1898,6 @@ class FiniteElement : public Subscriptor, std::vector compute_n_nonzero_components (const std::vector > &nonzero_components); - /** - * Allow the FESystem class to access the - * restriction and prolongation matrices - * directly. Hence, FESystem has the - * possibility to see if these matrices - * are initialized without accessing - * these matrices through the - * @p get_restriction_matrix and - * @p get_prolongation_matrix - * functions. This is important as these - * functions include assertions that - * throw if the matrices are not already - * initialized. - */ - template friend class FESystem; - - /** - * Make the inner class a - * friend. This is not strictly - * necessary, but the Intel - * compiler seems to want this. - */ - friend class InternalDataBase; - /** * Exception @@ -2130,6 +2106,30 @@ class FiniteElement : public Subscriptor, typename Mapping::InternalDataBase &fe_internal, FEValuesData &data) const = 0; + /** + * Allow the FESystem class to access the + * restriction and prolongation matrices + * directly. Hence, FESystem has the + * possibility to see if these matrices + * are initialized without accessing + * these matrices through the + * @p get_restriction_matrix and + * @p get_prolongation_matrix + * functions. This is important as these + * functions include assertions that + * throw if the matrices are not already + * initialized. + */ + template friend class FESystem; + + /** + * Make the inner class a + * friend. This is not strictly + * necessary, but the Intel + * compiler seems to want this. + */ + friend class InternalDataBase; + /** * Declare some other classes as * friends of this class. @@ -2138,7 +2138,6 @@ class FiniteElement : public Subscriptor, friend class FEValues; friend class FEFaceValues; friend class FESubfaceValues; - friend class FESystem; friend class hp::FECollection; };