From b9fd8a3b8e2f692350c3c0ed4801d1d66b022826 Mon Sep 17 00:00:00 2001 From: Jane Tournois Date: Fri, 2 May 2025 14:44:36 +0200 Subject: [PATCH] rename Base_with_time_stamp to Triangulation_simplex_base_with_time_stamp --- .../CGAL/Conforming_Delaunay_triangulation_3.h | 1 - ...onforming_constrained_Delaunay_triangulation_3.h | 5 ++--- ...constrained_Delaunay_triangulation_cell_base_3.h | 6 +++--- ...nstrained_Delaunay_triangulation_vertex_base_3.h | 6 +++--- .../include/CGAL/Kinetic_space_partition_3.h | 1 - SMDS_3/include/CGAL/SMDS_3/io_signature.h | 7 +++++-- .../doc/STL_Extension/Concepts/BaseWithTimeStamp.h | 2 +- ...=> Triangulation_simplex_base_with_time_stamp.h} | 13 ++++++++----- 8 files changed, 22 insertions(+), 19 deletions(-) rename STL_Extension/include/CGAL/{Base_with_time_stamp.h => Triangulation_simplex_base_with_time_stamp.h} (77%) diff --git a/Constrained_triangulation_3/include/CGAL/Conforming_Delaunay_triangulation_3.h b/Constrained_triangulation_3/include/CGAL/Conforming_Delaunay_triangulation_3.h index 02cb16ca53e..a47dc75499a 100644 --- a/Constrained_triangulation_3/include/CGAL/Conforming_Delaunay_triangulation_3.h +++ b/Constrained_triangulation_3/include/CGAL/Conforming_Delaunay_triangulation_3.h @@ -16,7 +16,6 @@ #include -#include #include #include #include diff --git a/Constrained_triangulation_3/include/CGAL/Conforming_constrained_Delaunay_triangulation_3.h b/Constrained_triangulation_3/include/CGAL/Conforming_constrained_Delaunay_triangulation_3.h index 1a9654504e3..e8797fcbdd7 100644 --- a/Constrained_triangulation_3/include/CGAL/Conforming_constrained_Delaunay_triangulation_3.h +++ b/Constrained_triangulation_3/include/CGAL/Conforming_constrained_Delaunay_triangulation_3.h @@ -18,14 +18,13 @@ #include -#include +#include #include #include #include #include #include #include -#include #include #include #include @@ -1088,7 +1087,7 @@ private: Facet facet_3d = {}; }; using Vb1 = Triangulation_vertex_base_with_info_2; - using Vb = Base_with_time_stamp; + using Vb = Triangulation_simplex_base_with_time_stamp; using Fb1 = Triangulation_face_base_with_info_2; using Fb = Constrained_triangulation_face_base_2; using TDS = Triangulation_data_structure_2; diff --git a/Constrained_triangulation_3/include/CGAL/Conforming_constrained_Delaunay_triangulation_cell_base_3.h b/Constrained_triangulation_3/include/CGAL/Conforming_constrained_Delaunay_triangulation_cell_base_3.h index 244584b7fe4..5de9e7c64b3 100644 --- a/Constrained_triangulation_3/include/CGAL/Conforming_constrained_Delaunay_triangulation_cell_base_3.h +++ b/Constrained_triangulation_3/include/CGAL/Conforming_constrained_Delaunay_triangulation_cell_base_3.h @@ -14,7 +14,7 @@ #include -#include +#include #include #include #include @@ -40,9 +40,9 @@ namespace CGAL { */ template > class Conforming_constrained_Delaunay_triangulation_cell_base_3 - : public Base_with_time_stamp + : public Triangulation_simplex_base_with_time_stamp { - using Base = Base_with_time_stamp; + using Base = Triangulation_simplex_base_with_time_stamp; Conforming_constrained_Delaunay_triangulation_cell_data_3 ccdt_3_data_; CDT_3_signed_index subdomain_index_ = -1; diff --git a/Constrained_triangulation_3/include/CGAL/Conforming_constrained_Delaunay_triangulation_vertex_base_3.h b/Constrained_triangulation_3/include/CGAL/Conforming_constrained_Delaunay_triangulation_vertex_base_3.h index 667af60a738..b93c22c3594 100644 --- a/Constrained_triangulation_3/include/CGAL/Conforming_constrained_Delaunay_triangulation_vertex_base_3.h +++ b/Constrained_triangulation_3/include/CGAL/Conforming_constrained_Delaunay_triangulation_vertex_base_3.h @@ -15,7 +15,7 @@ #include -#include +#include #include #include #include @@ -39,7 +39,7 @@ namespace CGAL { */ template < typename Traits, typename VertexBase = Triangulation_vertex_base_3 > class Conforming_constrained_Delaunay_triangulation_vertex_base_3 - : public Base_with_time_stamp + : public Triangulation_simplex_base_with_time_stamp { Conforming_constrained_Delaunay_triangulation_vertex_data_3 ccdt_3_data_; bool cache_validity_ = false; @@ -57,7 +57,7 @@ public: }; // constructors, inherited from the base class - using Base = Base_with_time_stamp; + using Base = Triangulation_simplex_base_with_time_stamp; using Base::Base; // model of SimplicialMeshVertexBase_3 diff --git a/Kinetic_space_partition/include/CGAL/Kinetic_space_partition_3.h b/Kinetic_space_partition/include/CGAL/Kinetic_space_partition_3.h index 23a43b8f646..214818f3f7b 100644 --- a/Kinetic_space_partition/include/CGAL/Kinetic_space_partition_3.h +++ b/Kinetic_space_partition/include/CGAL/Kinetic_space_partition_3.h @@ -29,7 +29,6 @@ #include #include #include -#include #include #include diff --git a/SMDS_3/include/CGAL/SMDS_3/io_signature.h b/SMDS_3/include/CGAL/SMDS_3/io_signature.h index bae31c072c7..5ec009eea29 100644 --- a/SMDS_3/include/CGAL/SMDS_3/io_signature.h +++ b/SMDS_3/include/CGAL/SMDS_3/io_signature.h @@ -29,6 +29,10 @@ #include #include +#ifdef CGAL_BASE_WITH_TIME_STAMP_H +#include +#endif + #ifdef CGAL_PERIODIC_3_MESH_3_CONFIG_H #include #include @@ -362,8 +366,7 @@ Get_io_signature -struct -Get_io_signature > +struct Get_io_signature> { std::string operator()() { return Get_io_signature()(); diff --git a/STL_Extension/doc/STL_Extension/Concepts/BaseWithTimeStamp.h b/STL_Extension/doc/STL_Extension/Concepts/BaseWithTimeStamp.h index 173de237b20..32e21cf07d5 100644 --- a/STL_Extension/doc/STL_Extension/Concepts/BaseWithTimeStamp.h +++ b/STL_Extension/doc/STL_Extension/Concepts/BaseWithTimeStamp.h @@ -8,7 +8,7 @@ an object must provide so that its timestamp is updated by a `CGAL::Compact_container` or a `CGAL::Concurrent_compact_container`. \cgalHasModelsBegin -\cgalHasModels{CGAL::Base_with_time_stamp} +\cgalHasModels{CGAL::Triangulation_simplex_base_with_time_stamp} \cgalHasModelsEnd \sa `CGAL::Compact_container` diff --git a/STL_Extension/include/CGAL/Base_with_time_stamp.h b/STL_Extension/include/CGAL/Triangulation_simplex_base_with_time_stamp.h similarity index 77% rename from STL_Extension/include/CGAL/Base_with_time_stamp.h rename to STL_Extension/include/CGAL/Triangulation_simplex_base_with_time_stamp.h index 041e66ce8c2..1e80a1acf06 100644 --- a/STL_Extension/include/CGAL/Base_with_time_stamp.h +++ b/STL_Extension/include/CGAL/Triangulation_simplex_base_with_time_stamp.h @@ -7,8 +7,8 @@ // // Author(s) : Laurent Rineau -#ifndef CGAL_BASE_WITH_TIME_STAMP_H -#define CGAL_BASE_WITH_TIME_STAMP_H +#ifndef CGAL_SIMPLEX_BASE_WITH_TIME_STAMP_H +#define CGAL_SIMPLEX_BASE_WITH_TIME_STAMP_H #include // for Tag_true #include // for std::size_t @@ -21,8 +21,11 @@ namespace CGAL { /// This class is a base class that can be used to add a time stamp to any class. /// \cgalModels{BaseWithTimeStamp} template -class Base_with_time_stamp : public BaseWithTSBase { +class Triangulation_simplex_base_with_time_stamp + : public BaseWithTSBase + { std::size_t time_stamp_ = std::size_t(-2); + public: using BaseWithTSBase::BaseWithTSBase; @@ -38,10 +41,10 @@ public: template < class TDS > struct Rebind_TDS { typedef typename BaseWithTSBase::template Rebind_TDS::Other Base2; - typedef Base_with_time_stamp Other; + typedef Triangulation_simplex_base_with_time_stamp Other; }; }; } // namespace CGAL -#endif // CGAL_BASE_WITH_TIME_STAMP_H +#endif // CGAL_SIMPLEX_BASE_WITH_TIME_STAMP_H