From 395d4896e651f19cf7509be6eda0a5b75b26db1a Mon Sep 17 00:00:00 2001 From: Wolfgang Bangerth Date: Sat, 25 Feb 2023 14:49:37 -0700 Subject: [PATCH] Add a 'requires' clause to class Triangulation. --- include/deal.II/distributed/p4est_wrappers.h | 1 + include/deal.II/dofs/dof_handler.h | 1 + include/deal.II/grid/cell_id.h | 3 ++- include/deal.II/grid/grid_in.h | 3 ++- include/deal.II/grid/grid_out.h | 1 + include/deal.II/grid/grid_refinement.h | 1 + include/deal.II/grid/grid_tools.h | 2 +- include/deal.II/grid/tria.h | 1 + include/deal.II/grid/tria_accessor.h | 3 +++ include/deal.II/grid/tria_iterator.h | 1 + include/deal.II/grid/tria_objects.h | 1 + include/deal.II/numerics/time_dependent.h | 1 + include/deal.II/numerics/vector_tools_integrate_difference.h | 1 + 13 files changed, 17 insertions(+), 3 deletions(-) diff --git a/include/deal.II/distributed/p4est_wrappers.h b/include/deal.II/distributed/p4est_wrappers.h index 44d3a8c1a7..c3c46f84e8 100644 --- a/include/deal.II/distributed/p4est_wrappers.h +++ b/include/deal.II/distributed/p4est_wrappers.h @@ -47,6 +47,7 @@ namespace parallel namespace distributed { template + DEAL_II_CXX20_REQUIRES((concepts::is_valid_dim_spacedim)) class Triangulation; } } // namespace parallel diff --git a/include/deal.II/dofs/dof_handler.h b/include/deal.II/dofs/dof_handler.h index d7ef70ebac..cdf76cca82 100644 --- a/include/deal.II/dofs/dof_handler.h +++ b/include/deal.II/dofs/dof_handler.h @@ -50,6 +50,7 @@ DEAL_II_NAMESPACE_OPEN template class FiniteElement; template +DEAL_II_CXX20_REQUIRES((concepts::is_valid_dim_spacedim)) class Triangulation; namespace internal diff --git a/include/deal.II/grid/cell_id.h b/include/deal.II/grid/cell_id.h index 67d9058b96..73e25f46c3 100644 --- a/include/deal.II/grid/cell_id.h +++ b/include/deal.II/grid/cell_id.h @@ -34,7 +34,8 @@ DEAL_II_NAMESPACE_OPEN // Forward declarations #ifndef DOXYGEN -template +template +DEAL_II_CXX20_REQUIRES((concepts::is_valid_dim_spacedim)) class Triangulation; #endif diff --git a/include/deal.II/grid/grid_in.h b/include/deal.II/grid/grid_in.h index b0b8fca345..e5688da8a1 100644 --- a/include/deal.II/grid/grid_in.h +++ b/include/deal.II/grid/grid_in.h @@ -31,7 +31,8 @@ DEAL_II_NAMESPACE_OPEN // Forward declarations #ifndef DOXYGEN -template +template +DEAL_II_CXX20_REQUIRES((concepts::is_valid_dim_spacedim)) class Triangulation; template struct CellData; diff --git a/include/deal.II/grid/grid_out.h b/include/deal.II/grid/grid_out.h index 99410a3eed..41bbb40519 100644 --- a/include/deal.II/grid/grid_out.h +++ b/include/deal.II/grid/grid_out.h @@ -32,6 +32,7 @@ DEAL_II_NAMESPACE_OPEN #ifndef DOXYGEN class ParameterHandler; template +DEAL_II_CXX20_REQUIRES((concepts::is_valid_dim_spacedim)) class Triangulation; template class Mapping; diff --git a/include/deal.II/grid/grid_refinement.h b/include/deal.II/grid/grid_refinement.h index 6a28333574..b9996eb83f 100644 --- a/include/deal.II/grid/grid_refinement.h +++ b/include/deal.II/grid/grid_refinement.h @@ -30,6 +30,7 @@ DEAL_II_NAMESPACE_OPEN // forward declarations #ifndef DOXYGEN template +DEAL_II_CXX20_REQUIRES((concepts::is_valid_dim_spacedim)) class Triangulation; template class Vector; diff --git a/include/deal.II/grid/grid_tools.h b/include/deal.II/grid/grid_tools.h index d756d6e736..025a4c95d3 100644 --- a/include/deal.II/grid/grid_tools.h +++ b/include/deal.II/grid/grid_tools.h @@ -71,7 +71,7 @@ namespace parallel { namespace distributed { - template + template class Triangulation; } } // namespace parallel diff --git a/include/deal.II/grid/tria.h b/include/deal.II/grid/tria.h index a26caed12e..1a7b8f6b1e 100644 --- a/include/deal.II/grid/tria.h +++ b/include/deal.II/grid/tria.h @@ -1131,6 +1131,7 @@ namespace internal * @ingroup grid aniso */ template +DEAL_II_CXX20_REQUIRES((concepts::is_valid_dim_spacedim)) class Triangulation : public Subscriptor { private: diff --git a/include/deal.II/grid/tria_accessor.h b/include/deal.II/grid/tria_accessor.h index eff7f3ff0d..60d3d4206b 100644 --- a/include/deal.II/grid/tria_accessor.h +++ b/include/deal.II/grid/tria_accessor.h @@ -39,6 +39,7 @@ DEAL_II_NAMESPACE_OPEN // Forward declarations #ifndef DOXYGEN template +DEAL_II_CXX20_REQUIRES((concepts::is_valid_dim_spacedim)) class Triangulation; template class TriaRawIterator; @@ -1870,6 +1871,7 @@ private: private: template + DEAL_II_CXX20_REQUIRES((concepts::is_valid_dim_spacedim)) friend class Triangulation; friend struct dealii::internal::TriangulationImplementation::Implementation; @@ -4170,6 +4172,7 @@ private: set_direction_flag(const bool new_direction_flag) const; template + DEAL_II_CXX20_REQUIRES((concepts::is_valid_dim_spacedim)) friend class Triangulation; template diff --git a/include/deal.II/grid/tria_iterator.h b/include/deal.II/grid/tria_iterator.h index 27519e6a7f..886d583f52 100644 --- a/include/deal.II/grid/tria_iterator.h +++ b/include/deal.II/grid/tria_iterator.h @@ -32,6 +32,7 @@ DEAL_II_NAMESPACE_OPEN // Forward declarations #ifndef DOXYGEN template +DEAL_II_CXX20_REQUIRES((concepts::is_valid_dim_spacedim)) class Triangulation; template class TriaAccessorBase; diff --git a/include/deal.II/grid/tria_objects.h b/include/deal.II/grid/tria_objects.h index dd49eead8d..f9693faaf3 100644 --- a/include/deal.II/grid/tria_objects.h +++ b/include/deal.II/grid/tria_objects.h @@ -29,6 +29,7 @@ DEAL_II_NAMESPACE_OPEN // Forward declarations #ifndef DOXYGEN template +DEAL_II_CXX20_REQUIRES((concepts::is_valid_dim_spacedim)) class Triangulation; template class TriaRawIterator; diff --git a/include/deal.II/numerics/time_dependent.h b/include/deal.II/numerics/time_dependent.h index e40dec2890..243684da32 100644 --- a/include/deal.II/numerics/time_dependent.h +++ b/include/deal.II/numerics/time_dependent.h @@ -34,6 +34,7 @@ class TimeStepBase; template class Vector; template +DEAL_II_CXX20_REQUIRES((concepts::is_valid_dim_spacedim)) class Triangulation; #endif diff --git a/include/deal.II/numerics/vector_tools_integrate_difference.h b/include/deal.II/numerics/vector_tools_integrate_difference.h index 247123c186..27a9398164 100644 --- a/include/deal.II/numerics/vector_tools_integrate_difference.h +++ b/include/deal.II/numerics/vector_tools_integrate_difference.h @@ -32,6 +32,7 @@ class Mapping; template class Quadrature; template +DEAL_II_CXX20_REQUIRES((concepts::is_valid_dim_spacedim)) class Triangulation; namespace hp { -- 2.39.5