diff --git a/Triangulation_3/include/CGAL/Conforming_Delaunay_triangulation_3.h b/Triangulation_3/include/CGAL/Conforming_Delaunay_triangulation_3.h index 4703a57a403..3d0a05baf66 100644 --- a/Triangulation_3/include/CGAL/Conforming_Delaunay_triangulation_3.h +++ b/Triangulation_3/include/CGAL/Conforming_Delaunay_triangulation_3.h @@ -25,6 +25,7 @@ #include +#include #include #include @@ -41,7 +42,7 @@ namespace CGAL { enum class CDT_3_vertex_type { FREE, CORNER, STEINER_ON_EDGE, STEINER_IN_FACE }; template > -struct Conforming_Delaunay_triangulation_vertex_base_3 : public Vb { +struct Conforming_Delaunay_triangulation_vertex_base_3 : public Base_with_time_stamp { int nb_of_incident_constraints = 0; void* c_id = nullptr; private: @@ -54,7 +55,8 @@ public: typedef Conforming_Delaunay_triangulation_vertex_base_3 Other; }; - using Vb::Vb; + using Base = Base_with_time_stamp; + using Base::Base; template auto constraint_id(const Triangulation&) const { diff --git a/Triangulation_3/include/CGAL/Constrained_Delaunay_triangulation_3.h b/Triangulation_3/include/CGAL/Constrained_Delaunay_triangulation_3.h index 6d5f0643367..16c5efc26f3 100644 --- a/Triangulation_3/include/CGAL/Constrained_Delaunay_triangulation_3.h +++ b/Triangulation_3/include/CGAL/Constrained_Delaunay_triangulation_3.h @@ -25,6 +25,7 @@ #include +#include #include #include #include @@ -99,9 +100,9 @@ public: template > class Constrained_Delaunay_triangulation_cell_base_3 - : public Cb + : public Base_with_time_stamp { - using Base = Cb; + using Base = Base_with_time_stamp; std::array face_id = { -1, -1, -1, -1 }; std::array facet_2d = {nullptr, nullptr, nullptr, nullptr}; diff --git a/Triangulation_3/test/Triangulation_3/cdt_3_from_off.cpp b/Triangulation_3/test/Triangulation_3/cdt_3_from_off.cpp index 171a467dfbc..dc51ccb6837 100644 --- a/Triangulation_3/test/Triangulation_3/cdt_3_from_off.cpp +++ b/Triangulation_3/test/Triangulation_3/cdt_3_from_off.cpp @@ -5,7 +5,6 @@ #include #include #include -#include #include #include @@ -44,8 +43,8 @@ using K = CGAL::Exact_predicates_inexact_constructions_kernel; #endif // use Epick -using Vb = CGAL::Base_with_time_stamp>; -using Cb = CGAL::Base_with_time_stamp>; +using Vb = CGAL::Constrained_Delaunay_triangulation_vertex_base_3; +using Cb = CGAL::Constrained_Delaunay_triangulation_cell_base_3; using Tds = CGAL::Triangulation_data_structure_3; using Delaunay = CGAL::Delaunay_triangulation_3; using CDT = CGAL::Constrained_Delaunay_triangulation_3;