songsenand
/
cgal
mirror of https://github.com/CGAL/cgal
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

fix CC time_stamper

This commit is contained in:
Laurent Rineau 2024-04-22 14:23:24 +02:00
parent bd284e70ae
commit aad04f71d3
2 changed files with 4 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
STL_Extension/include/CGAL/Compact_container.h
View File

@ -274,7 +274,7 @@ public:
{ {
init(); init();
block_size = c.block_size; block_size = c.block_size;
time_stamp = c.time_stamp.load(); time_stamp = 0;
std::copy(c.begin(), c.end(), CGAL::inserter(*this)); std::copy(c.begin(), c.end(), CGAL::inserter(*this));
} }

6
STL_Extension/test/STL_Extension/test_Compact_container.cpp
View File

@ -305,10 +305,10 @@ int main()
typedef Node_1<CGAL::Tag_false> T2; typedef Node_1<CGAL::Tag_false> T2;
typedef CGAL::Compact_container<T2> C2; // without timestamps typedef CGAL::Compact_container<T2> C2; // without timestamps
typedef CGAL::Compact_container<T2, typedef CGAL::Compact_container<T1,
CGAL::Default, CGAL::Default,
CGAL::Default, CGAL::Default,
CGAL::Time_stamper<T2> > C4; CGAL::Time_stamper<T1> > C4;
// with timestamps // with timestamps
typedef Node_2 T3; typedef Node_2 T3;
@ -337,7 +337,7 @@ int main()
{ {
std::cerr << "Error timestamper of C3\n"; return 1; std::cerr << "Error timestamper of C3\n"; return 1;
} }
if(! std::is_base_of<CGAL::Time_stamper<T2>, if(! std::is_base_of<CGAL::Time_stamper<T1>,
C4::Time_stamper>::value) C4::Time_stamper>::value)
{ {
std::cerr << "Error timestamper of C4\n"; return 1; std::cerr << "Error timestamper of C4\n"; return 1;