From 638d12593f0a1fab0d51cc635be1dec6192be121 Mon Sep 17 00:00:00 2001 From: Sven Oesau Date: Mon, 1 Dec 2025 15:51:21 +0100 Subject: [PATCH 1/2] adding timestamp to convex_hull_3 vertex and face base --- .../include/CGAL/Convex_hull_face_base_2.h | 15 +++++++++++++++ .../include/CGAL/Convex_hull_vertex_base_2.h | 15 +++++++++++++++ 2 files changed, 30 insertions(+) diff --git a/Convex_hull_3/include/CGAL/Convex_hull_face_base_2.h b/Convex_hull_3/include/CGAL/Convex_hull_face_base_2.h index 7899a0da840..ce9eeb3f81d 100644 --- a/Convex_hull_3/include/CGAL/Convex_hull_face_base_2.h +++ b/Convex_hull_3/include/CGAL/Convex_hull_face_base_2.h @@ -18,6 +18,8 @@ #include #include +#include +#include #include @@ -29,6 +31,7 @@ class Convex_hull_face_base_2 : public Fb { int _info = 0; + std::size_t time_stamp_ = std::size_t(-2); public: typedef typename Fb::Vertex_handle Vertex_handle; @@ -64,6 +67,18 @@ public: static int ccw(int i) {return Triangulation_cw_ccw_2::ccw(i);} static int cw(int i) {return Triangulation_cw_ccw_2::cw(i);} + + /// For the determinism of Compact_container iterators + ///@{ + typedef Tag_true Has_timestamp; + + std::size_t time_stamp() const { + return time_stamp_; + } + void set_time_stamp(const std::size_t& ts) { + time_stamp_ = ts; + } + ///@} }; } //namespace CGAL diff --git a/Convex_hull_3/include/CGAL/Convex_hull_vertex_base_2.h b/Convex_hull_3/include/CGAL/Convex_hull_vertex_base_2.h index cef5f5eeac8..6016d65c62b 100644 --- a/Convex_hull_3/include/CGAL/Convex_hull_vertex_base_2.h +++ b/Convex_hull_3/include/CGAL/Convex_hull_vertex_base_2.h @@ -19,6 +19,8 @@ #include #include +#include +#include #include @@ -38,6 +40,7 @@ public: private: int _info = 0; Point _p; + std::size_t time_stamp_ = std::size_t(-2); public: template < typename TDS2 > @@ -65,6 +68,18 @@ public: const int& info() const { return _info; } int& info() { return _info; } + + /// For the determinism of Compact_container iterators + ///@{ + typedef Tag_true Has_timestamp; + + std::size_t time_stamp() const { + return time_stamp_; + } + void set_time_stamp(const std::size_t& ts) { + time_stamp_ = ts; + } + ///@} }; template From 7fbee84a0e48403aa307a14b9df527f092936609 Mon Sep 17 00:00:00 2001 From: Sven Oesau Date: Tue, 9 Dec 2025 14:42:38 +0100 Subject: [PATCH 2/2] remove timestamp from Convex_hull_face_base_2 --- .../include/CGAL/Convex_hull_face_base_2.h | 17 +---------------- 1 file changed, 1 insertion(+), 16 deletions(-) diff --git a/Convex_hull_3/include/CGAL/Convex_hull_face_base_2.h b/Convex_hull_3/include/CGAL/Convex_hull_face_base_2.h index ce9eeb3f81d..b0055b83f11 100644 --- a/Convex_hull_3/include/CGAL/Convex_hull_face_base_2.h +++ b/Convex_hull_3/include/CGAL/Convex_hull_face_base_2.h @@ -18,8 +18,6 @@ #include #include -#include -#include #include @@ -31,7 +29,6 @@ class Convex_hull_face_base_2 : public Fb { int _info = 0; - std::size_t time_stamp_ = std::size_t(-2); public: typedef typename Fb::Vertex_handle Vertex_handle; @@ -59,7 +56,7 @@ public: Vertex_handle v2, Face_handle n0, Face_handle n1, - Face_handle n2 ) + Face_handle n2) : Fb(v0, v1, v2, n0, n1, n2), _info(0) {} const int& info() const { return _info; } @@ -67,18 +64,6 @@ public: static int ccw(int i) {return Triangulation_cw_ccw_2::ccw(i);} static int cw(int i) {return Triangulation_cw_ccw_2::cw(i);} - - /// For the determinism of Compact_container iterators - ///@{ - typedef Tag_true Has_timestamp; - - std::size_t time_stamp() const { - return time_stamp_; - } - void set_time_stamp(const std::size_t& ts) { - time_stamp_ = ts; - } - ///@} }; } //namespace CGAL