From 4854c500b0b275b80c0de677763c32d5cf836b2a Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?S=C3=A9bastien=20Loriot?= Date: Mon, 26 Jun 2023 17:41:16 +0200 Subject: [PATCH] restore usage of boost prior/next that breaks at runtime --- .../include/CGAL/Polyline_simplification_2/simplify.h | 11 ++++++----- 1 file changed, 6 insertions(+), 5 deletions(-) diff --git a/Polyline_simplification_2/include/CGAL/Polyline_simplification_2/simplify.h b/Polyline_simplification_2/include/CGAL/Polyline_simplification_2/simplify.h index 85404f86c2d..17ddecd3ba4 100644 --- a/Polyline_simplification_2/include/CGAL/Polyline_simplification_2/simplify.h +++ b/Polyline_simplification_2/include/CGAL/Polyline_simplification_2/simplify.h @@ -30,6 +30,7 @@ #include // Needed for Polygon_2 +#include #include #include @@ -154,11 +155,11 @@ public: (*it)->set_removable(false); ++it; for(; it != ite; ++it){ - if((std::next(it) != ite) && (std::prev(it)== std::next(it))){ + if((boost::next(it) != ite) && (boost::prior(it)==boost::prior(it))){ (*it)->set_removable(false); } } - it = std::prev(it); + it = boost::prior(it); (*it)->set_removable(false); } @@ -245,9 +246,9 @@ public: } Vertex_handle vh = *it; - Vertices_in_constraint_iterator u = std::prev(it); + Vertices_in_constraint_iterator u = boost::prior(it); Vertex_handle uh = *u; - Vertices_in_constraint_iterator w = std::next(it); + Vertices_in_constraint_iterator w = boost::next(it); Vertex_handle wh = *w; typename Geom_traits::Orientation_2 orientation_2 = pct.geom_traits().orientation_2_object(); @@ -322,7 +323,7 @@ operator()() Vertices_in_constraint_iterator vit = vertex_to_iterator[v].front(); if(is_removable(vit)){ - Vertices_in_constraint_iterator u = std::prev(vit), w = std::next(vit); + Vertices_in_constraint_iterator u = boost::prior(vit), w = boost::next(vit); pct.simplify(vit); if((*u)->is_removable()){