From: Daniel Arndt Date: Wed, 15 Mar 2023 17:48:34 +0000 (-0400) Subject: Limit friend declarations for DofHandler and Triangulation to the same template param... X-Git-Tag: v9.5.0-rc1~471^2 X-Git-Url: https://gitweb.dealii.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=refs%2Fpull%2F14898%2Fhead;p=dealii.git Limit friend declarations for DofHandler and Triangulation to the same template parameters --- diff --git a/include/deal.II/dofs/dof_accessor.h b/include/deal.II/dofs/dof_accessor.h index cac4c92a63..4244fe8b05 100644 --- a/include/deal.II/dofs/dof_accessor.h +++ b/include/deal.II/dofs/dof_accessor.h @@ -738,9 +738,7 @@ protected: private: // Make the DoFHandler class a friend so that it can call the set_xxx() // functions. - template - DEAL_II_CXX20_REQUIRES((concepts::is_valid_dim_spacedim)) - friend class DoFHandler; + friend class DoFHandler; friend struct dealii::internal::DoFHandlerImplementation::Policy:: Implementation; @@ -1209,9 +1207,7 @@ protected: // Make the DoFHandler class a friend so that it can call the set_xxx() // functions. - template - DEAL_II_CXX20_REQUIRES((concepts::is_valid_dim_spacedim)) - friend class DoFHandler; + friend class DoFHandler<1, spacedim>; friend struct dealii::internal::DoFHandlerImplementation::Policy:: Implementation; diff --git a/include/deal.II/grid/tria_accessor.h b/include/deal.II/grid/tria_accessor.h index 07da118645..ee950f0719 100644 --- a/include/deal.II/grid/tria_accessor.h +++ b/include/deal.II/grid/tria_accessor.h @@ -1871,9 +1871,7 @@ private: clear_children() const; private: - template - DEAL_II_CXX20_REQUIRES((concepts::is_valid_dim_spacedim)) - friend class Triangulation; + friend class Triangulation; friend struct dealii::internal::TriangulationImplementation::Implementation; friend struct dealii::internal::TriangulationImplementation:: @@ -4172,9 +4170,7 @@ private: void set_direction_flag(const bool new_direction_flag) const; - template - DEAL_II_CXX20_REQUIRES((concepts::is_valid_dim_spacedim)) - friend class Triangulation; + friend class Triangulation; template friend class parallel::TriangulationBase;