From aad04f71d3e044349f39b4180c5449aa4c0bd094 Mon Sep 17 00:00:00 2001 From: Laurent Rineau Date: Mon, 22 Apr 2024 14:23:24 +0200 Subject: [PATCH] fix CC time_stamper --- STL_Extension/include/CGAL/Compact_container.h | 2 +- STL_Extension/test/STL_Extension/test_Compact_container.cpp | 6 +++--- 2 files changed, 4 insertions(+), 4 deletions(-) diff --git a/STL_Extension/include/CGAL/Compact_container.h b/STL_Extension/include/CGAL/Compact_container.h index 37a788fdb1f..4ee70b10a93 100644 --- a/STL_Extension/include/CGAL/Compact_container.h +++ b/STL_Extension/include/CGAL/Compact_container.h @@ -274,7 +274,7 @@ public: { init(); block_size = c.block_size; - time_stamp = c.time_stamp.load(); + time_stamp = 0; std::copy(c.begin(), c.end(), CGAL::inserter(*this)); } diff --git a/STL_Extension/test/STL_Extension/test_Compact_container.cpp b/STL_Extension/test/STL_Extension/test_Compact_container.cpp index 60aa43db0e2..bf6b0d83948 100644 --- a/STL_Extension/test/STL_Extension/test_Compact_container.cpp +++ b/STL_Extension/test/STL_Extension/test_Compact_container.cpp @@ -305,10 +305,10 @@ int main() typedef Node_1 T2; typedef CGAL::Compact_container C2; // without timestamps - typedef CGAL::Compact_container > C4; + CGAL::Time_stamper > C4; // with timestamps typedef Node_2 T3; @@ -337,7 +337,7 @@ int main() { std::cerr << "Error timestamper of C3\n"; return 1; } - if(! std::is_base_of, + if(! std::is_base_of, C4::Time_stamper>::value) { std::cerr << "Error timestamper of C4\n"; return 1;