Limit friend declarations for DofHandler and Triangulation to the same template param...

diff --git a/include/deal.II/dofs/dof_accessor.h b/include/deal.II/dofs/dof_accessor.h
index cac4c92a63c2a7adb8e5c8bd10a18ab12f97d7cb..4244fe8b05c622e0d3f8f11def8163f3b24c6166 100644 (file)
--- 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 <int, int>
-  DEAL_II_CXX20_REQUIRES((concepts::is_valid_dim_spacedim<dim, spacedim>))
-  friend class DoFHandler;
+  friend class DoFHandler<dim, spacedim>;
 
   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 <int dim1, int spacedim1>
-  DEAL_II_CXX20_REQUIRES((concepts::is_valid_dim_spacedim<dim1, spacedim1>))
-  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 07da1186452834930b6b8987ba52a929ec00fd03..ee950f0719d68356288e07904361b9545102e0a7 100644 (file)
--- 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 <int, int>
-  DEAL_II_CXX20_REQUIRES((concepts::is_valid_dim_spacedim<dim, spacedim>))
-  friend class Triangulation;
+  friend class Triangulation<dim, spacedim>;
 
   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 <int, int>
-  DEAL_II_CXX20_REQUIRES((concepts::is_valid_dim_spacedim<dim, spacedim>))
-  friend class Triangulation;
+  friend class Triangulation<dim, spacedim>;
 
   template <int, int>
   friend class parallel::TriangulationBase;