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

restore usage of boost prior/next that breaks at runtime

This commit is contained in:
Sébastien Loriot 2023-06-26 17:41:16 +02:00
parent dfc386d65b
commit 4854c500b0
1 changed files with 6 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

11
Polyline_simplification_2/include/CGAL/Polyline_simplification_2/simplify.h
View File

@ -30,6 +30,7 @@
#include <CGAL/algorithm.h> #include <CGAL/algorithm.h>
// Needed for Polygon_2 // Needed for Polygon_2
#include <boost/next_prior.hpp>
#include <CGAL/Polygon_with_holes_2.h> #include <CGAL/Polygon_with_holes_2.h>
#include <CGAL/Constrained_Delaunay_triangulation_2.h> #include <CGAL/Constrained_Delaunay_triangulation_2.h>
@ -154,11 +155,11 @@ public:
(*it)->set_removable(false); (*it)->set_removable(false);
++it; ++it;
for(; it != ite; ++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)->set_removable(false);
} }
} }
it = std::prev(it); it = boost::prior(it);
(*it)->set_removable(false); (*it)->set_removable(false);
} }
@ -245,9 +246,9 @@ public:
} }
Vertex_handle vh = *it; Vertex_handle vh = *it;
Vertices_in_constraint_iterator u = std::prev(it); Vertices_in_constraint_iterator u = boost::prior(it);
Vertex_handle uh = *u; Vertex_handle uh = *u;
Vertices_in_constraint_iterator w = std::next(it); Vertices_in_constraint_iterator w = boost::next(it);
Vertex_handle wh = *w; Vertex_handle wh = *w;
typename Geom_traits::Orientation_2 orientation_2 = pct.geom_traits().orientation_2_object(); 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(); Vertices_in_constraint_iterator vit = vertex_to_iterator[v].front();
if(is_removable(vit)){ 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); pct.simplify(vit);
if((*u)->is_removable()){ if((*u)->is_removable()){