diff --git a/BGL/test/BGL/test_Face_filtered_graph.cpp b/BGL/test/BGL/test_Face_filtered_graph.cpp index 2bab2e1d83c..5dd6521bb02 100644 --- a/BGL/test/BGL/test_Face_filtered_graph.cpp +++ b/BGL/test/BGL/test_Face_filtered_graph.cpp @@ -37,7 +37,7 @@ void test_halfedge_around_vertex_iterator(const Graph& g) assert(target(*havit, fg) == *vit); // check if we are really moving clockwise - halfedge_around_target_iterator step = boost::next(havit); + halfedge_around_target_iterator step = std::next(havit); if(step != havend) { halfedge_descriptor stepd = *step; assert(stepd == opposite(next(*havit, fg), fg)); diff --git a/BGL/test/BGL/test_graph_traits.cpp b/BGL/test/BGL/test_graph_traits.cpp index 3d71af5a7c2..08e80ef75c7 100644 --- a/BGL/test/BGL/test_graph_traits.cpp +++ b/BGL/test/BGL/test_graph_traits.cpp @@ -34,7 +34,7 @@ void test_halfedge_around_vertex_iterator(const Graph& g) assert(target(*havit, g) == *vit); // check if we are really moving clockwise - halfedge_around_target_iterator step = boost::next(havit); + halfedge_around_target_iterator step = std::next(havit); if(step != havend) { halfedge_descriptor stepd = *step; assert(stepd == opposite(next(*havit, g), g)); diff --git a/CGAL_ipelets/demo/CGAL_ipelets/pca.cpp b/CGAL_ipelets/demo/CGAL_ipelets/pca.cpp index 5e476893af0..50d96042ba6 100644 --- a/CGAL_ipelets/demo/CGAL_ipelets/pca.cpp +++ b/CGAL_ipelets/demo/CGAL_ipelets/pca.cpp @@ -67,8 +67,8 @@ void pcaIpelet::protected_run(int fn) for (std::list::iterator it=poly_list.begin();it!=poly_list.end();++it) if (it->size()==3){ tri_list.push_back(Kernel::Triangle_2(*(it->vertices_begin()), - *boost::next(it->vertices_begin()), - *boost::next(it->vertices_begin(),2) + *std::next(it->vertices_begin()), + *std::next(it->vertices_begin(),2) )); } else{ diff --git a/CGAL_ipelets/include/CGAL/CGAL_Ipelet_base_v6.h b/CGAL_ipelets/include/CGAL/CGAL_Ipelet_base_v6.h index 1d55bf3269e..48572f24118 100644 --- a/CGAL_ipelets/include/CGAL/CGAL_Ipelet_base_v6.h +++ b/CGAL_ipelets/include/CGAL/CGAL_Ipelet_base_v6.h @@ -317,10 +317,10 @@ public: IpeSegmentSubPath* create_polyline(const iterator first, const iterator last,bool setclose=false) const { - if (boost::next(first)!=last){ + if (std::next(first)!=last){ IpeSegmentSubPath* SSP_ipe = new IpeSegmentSubPath(); IpeVector Prev_pt=IpeVector(CGAL::to_double(first->x()),CGAL::to_double(first->y())) ; - for (iterator it = boost::next(first);it!=last;++it){ + for (iterator it = std::next(first);it!=last;++it){ IpeVector Cur_pt=IpeVector(CGAL::to_double(it->x()),CGAL::to_double(it->y())); SSP_ipe -> AppendSegment(Prev_pt,Cur_pt); Prev_pt=Cur_pt; diff --git a/CGAL_ipelets/include/CGAL/CGAL_Ipelet_base_v7.h b/CGAL_ipelets/include/CGAL/CGAL_Ipelet_base_v7.h index cae6c0794f8..276e5d5c651 100644 --- a/CGAL_ipelets/include/CGAL/CGAL_Ipelet_base_v7.h +++ b/CGAL_ipelets/include/CGAL/CGAL_Ipelet_base_v7.h @@ -329,10 +329,10 @@ public: ipe::Curve* create_polyline(const iterator first, const iterator last,bool setclose=false) const { - if (boost::next(first)!=last){ + if (std::next(first)!=last){ ipe::Curve* SSP_ipe = new ipe::Curve(); ipe::Vector Prev_pt=ipe::Vector(CGAL::to_double(first->x()),CGAL::to_double(first->y())) ; - for (iterator it = boost::next(first);it!=last;++it){ + for (iterator it = std::next(first);it!=last;++it){ ipe::Vector Cur_pt=ipe::Vector(CGAL::to_double(it->x()),CGAL::to_double(it->y())); SSP_ipe -> appendSegment(Prev_pt,Cur_pt); Prev_pt=Cur_pt; diff --git a/Intersections_3/include/CGAL/Intersections_3/internal/Triangle_3_Triangle_3_intersection.h b/Intersections_3/include/CGAL/Intersections_3/internal/Triangle_3_Triangle_3_intersection.h index c4be2ae163d..2f036bc98a0 100644 --- a/Intersections_3/include/CGAL/Intersections_3/internal/Triangle_3_Triangle_3_intersection.h +++ b/Intersections_3/include/CGAL/Intersections_3/internal/Triangle_3_Triangle_3_intersection.h @@ -120,10 +120,10 @@ intersection_coplanar_triangles(const typename K::Triangle_3& t1, return intersection_return(*inter_pts.begin()); case 2: return intersection_return( - k.construct_segment_3_object()(*inter_pts.begin(), *boost::next(inter_pts.begin())) ); + k.construct_segment_3_object()(*inter_pts.begin(), *std::next(inter_pts.begin())) ); case 3: return intersection_return( - k.construct_triangle_3_object()(*inter_pts.begin(), *boost::next(inter_pts.begin()), *std::prev(inter_pts.end())) ); + k.construct_triangle_3_object()(*inter_pts.begin(), *std::next(inter_pts.begin()), *std::prev(inter_pts.end())) ); default: return intersection_return( std::vector(inter_pts.begin(),inter_pts.end())); diff --git a/Mesh_3/include/CGAL/Mesh_3/polylines_to_protect.h b/Mesh_3/include/CGAL/Mesh_3/polylines_to_protect.h index 7ee16b41b79..756bf520604 100644 --- a/Mesh_3/include/CGAL/Mesh_3/polylines_to_protect.h +++ b/Mesh_3/include/CGAL/Mesh_3/polylines_to_protect.h @@ -387,7 +387,7 @@ void snap_graph_vertices(Graph& graph, { if(poly_it->begin() != poly_it->end()) { tree.insert(*poly_it->begin()); - if(boost::next(poly_it->begin()) != poly_it->end()) { + if(std::next(poly_it->begin()) != poly_it->end()) { tree.insert(*std::prev(poly_it->end())); } } @@ -1048,10 +1048,10 @@ polylines_to_protect(std::vector >& polylines, continue; typename Polyline::const_iterator pit = polyline.begin(); - while (boost::next(pit) != polyline.end()) + while (std::next(pit) != polyline.end()) { vertex_descriptor v = g_manip.get_vertex(*pit, false); - vertex_descriptor w = g_manip.get_vertex(*boost::next(pit), false); + vertex_descriptor w = g_manip.get_vertex(*std::next(pit), false); g_manip.try_add_edge(v, w); ++pit; } @@ -1165,10 +1165,10 @@ merge_and_snap_polylines(const CGAL::Image_3& image, continue; auto pit = polyline.begin(); - while (boost::next(pit) != polyline.end()) + while (std::next(pit) != polyline.end()) { vertex_descriptor v = g_manip.get_vertex(*pit, false); - vertex_descriptor w = g_manip.get_vertex(*boost::next(pit), false); + vertex_descriptor w = g_manip.get_vertex(*std::next(pit), false); g_manip.try_add_edge(v, w); ++pit; } diff --git a/Mesh_3/include/CGAL/Mesh_domain_with_polyline_features_3.h b/Mesh_3/include/CGAL/Mesh_domain_with_polyline_features_3.h index 363d0d0c61b..400699d0e66 100644 --- a/Mesh_3/include/CGAL/Mesh_domain_with_polyline_features_3.h +++ b/Mesh_3/include/CGAL/Mesh_domain_with_polyline_features_3.h @@ -37,7 +37,7 @@ #include #include -#include // for std::prev and boost::next +#include // for std::prev and std::next #include #include diff --git a/Mesh_3/include/CGAL/Polyhedral_complex_mesh_domain_3.h b/Mesh_3/include/CGAL/Polyhedral_complex_mesh_domain_3.h index 72ba8cdaa0c..ce6de8775be 100644 --- a/Mesh_3/include/CGAL/Polyhedral_complex_mesh_domain_3.h +++ b/Mesh_3/include/CGAL/Polyhedral_complex_mesh_domain_3.h @@ -884,7 +884,7 @@ merge_duplicated_points(const PointSet& duplicated_points) typename Union_find_t::handle first_handle = handles[range_begin->second]; // In a second loop on the equal-range, update new_ids around p - for (it = boost::next(range_begin); it != range_end; ++it) + for (it = std::next(range_begin); it != range_end; ++it) { #if CGAL_MESH_3_VERBOSE > 10 std::cerr << " - #" << it->second << "\n"; diff --git a/Polygon_mesh_processing/include/CGAL/Polygon_mesh_processing/internal/Corefinement/intersection_of_coplanar_triangles_3.h b/Polygon_mesh_processing/include/CGAL/Polygon_mesh_processing/internal/Corefinement/intersection_of_coplanar_triangles_3.h index 50972f74193..45369d47bf5 100644 --- a/Polygon_mesh_processing/include/CGAL/Polygon_mesh_processing/internal/Corefinement/intersection_of_coplanar_triangles_3.h +++ b/Polygon_mesh_processing/include/CGAL/Polygon_mesh_processing/internal/Corefinement/intersection_of_coplanar_triangles_3.h @@ -253,7 +253,7 @@ struct Intersect_coplanar_faces_3 Orientation or_prev=orientations[prev],or_curr=orientations[curr]; if ( (or_prev==POSITIVE && or_curr==NEGATIVE) || (or_prev==NEGATIVE && or_curr==POSITIVE) ) { - Iterator it_curr = inter_pts_size_g_2 ? it:boost::next(it); + Iterator it_curr = inter_pts_size_g_2 ? it:std::next(it); prev=&(* inter_pts.insert( it_curr,operator()(*prev,*curr,h1,h2) ) ); orientations[prev]=COLLINEAR; CGAL_assertion_code(++pt_added;) @@ -278,7 +278,7 @@ struct Intersect_coplanar_faces_3 { if (orientations[&(*it)]==NEGATIVE){ inter_pts.erase(it++); - if (--nb_interpt == 2 && it!=inter_pts.end() && boost::next(it)==inter_pts.end()) should_revert_list=true; + if (--nb_interpt == 2 && it!=inter_pts.end() && std::next(it)==inter_pts.end()) should_revert_list=true; } else ++it; diff --git a/Polyhedron/demo/Polyhedron/Plugins/IO/Polylines_io_plugin.cpp b/Polyhedron/demo/Polyhedron/Plugins/IO/Polylines_io_plugin.cpp index fa09b603654..fd052aaf825 100644 --- a/Polyhedron/demo/Polyhedron/Plugins/IO/Polylines_io_plugin.cpp +++ b/Polyhedron/demo/Polyhedron/Plugins/IO/Polylines_io_plugin.cpp @@ -309,10 +309,10 @@ polylines_to_split(std::vector >& polylines, continue; typename Polyline::iterator pit = polyline.begin(); - while (boost::next(pit) != polyline.end()) + while (std::next(pit) != polyline.end()) { vertex_descriptor v = g_manip.get_vertex(*pit, false); - vertex_descriptor w = g_manip.get_vertex(*boost::next(pit), false); + vertex_descriptor w = g_manip.get_vertex(*std::next(pit), false); g_manip.try_add_edge(v, w); ++pit; } diff --git a/Polyhedron/demo/Polyhedron/Scene_polylines_item.cpp b/Polyhedron/demo/Polyhedron/Scene_polylines_item.cpp index 27e3d41ccc4..da241453b28 100644 --- a/Polyhedron/demo/Polyhedron/Scene_polylines_item.cpp +++ b/Polyhedron/demo/Polyhedron/Scene_polylines_item.cpp @@ -611,9 +611,9 @@ void Scene_polylines_item::split_at_sharp_angles() Bare_polyline_container::iterator current_polyline_it = bare_polyline_it; Bare_polyline& bare_polyline = *bare_polyline_it; - Bare_polyline::iterator it = boost::next(bare_polyline.begin()); + Bare_polyline::iterator it = std::next(bare_polyline.begin()); - if(boost::next(bare_polyline.begin()) == bare_polyline.end()) + if(std::next(bare_polyline.begin()) == bare_polyline.end()) { std::cerr << "WARNING: Isolated point in polylines\n"; bare_polyline_it = bare_polylines.erase(bare_polyline_it); @@ -625,7 +625,7 @@ void Scene_polylines_item::split_at_sharp_angles() for(; it != std::prev(bare_polyline.end()); ++it) { const Point_3 pv = *it; const Point_3 pa = *std::prev(it); - const Point_3 pb = *boost::next(it); + const Point_3 pb = *std::next(it); const K::Vector_3 av = pv - pa; const K::Vector_3 bv = pv - pb; const K::FT sc_prod = av * bv; @@ -648,7 +648,7 @@ void Scene_polylines_item::split_at_sharp_angles() // angle... const Point_3 pv = *bare_polyline.begin(); const Point_3 pa = *std::prev(std::prev(bare_polyline.end())); - const Point_3 pb = *boost::next(bare_polyline.begin()); + const Point_3 pb = *std::next(bare_polyline.begin()); const K::Vector_3 av = pv - pa; const K::Vector_3 bv = pv - pb; const K::FT sc_prod = av * bv; @@ -657,18 +657,18 @@ void Scene_polylines_item::split_at_sharp_angles() CGAL::square(sc_prod) < (av * av) * (bv * bv) / 4 ) ) { // if its beginning is a sharp angle, then split - bare_polyline.erase(boost::next(it), bare_polyline.end()); + bare_polyline.erase(std::next(it), bare_polyline.end()); } else { // ...if not, modifies its beginning - std::copy(boost::next(bare_polyline.begin()), - boost::next(it), + std::copy(std::next(bare_polyline.begin()), + std::next(it), std::back_inserter(new_polyline)); bare_polylines.erase(current_polyline_it); } } else { - bare_polyline.erase(boost::next(it), bare_polyline.end()); + bare_polyline.erase(std::next(it), bare_polyline.end()); } bare_polylines.push_back(new_polyline); break; diff --git a/Polyhedron/demo/Polyhedron/Scene_surface_mesh_item.cpp b/Polyhedron/demo/Polyhedron/Scene_surface_mesh_item.cpp index 75db7480aaa..47efcc20ce9 100644 --- a/Polyhedron/demo/Polyhedron/Scene_surface_mesh_item.cpp +++ b/Polyhedron/demo/Polyhedron/Scene_surface_mesh_item.cpp @@ -1216,7 +1216,7 @@ Scene_surface_mesh_item::select(double orig_x, const EPICK::Point_3* closest_point = boost::get(&(closest->first)); for(Intersections::iterator - it = boost::next(intersections.begin()), + it = std::next(intersections.begin()), end = intersections.end(); it != end; ++it) { @@ -1431,7 +1431,7 @@ bool Scene_surface_mesh_item::intersect_face(double orig_x, const EPICK::Point_3* closest_point = CGAL::object_cast(&closest->first); for(Intersections::iterator - it = boost::next(intersections.begin()), + it = std::next(intersections.begin()), end = intersections.end(); it != end; ++it) { @@ -1925,7 +1925,7 @@ void Scene_surface_mesh_item::zoomToPosition(const QPoint &point, CGAL::Three::V const EPICK::Point_3* closest_point = boost::get(&closest->first); for(Intersections::iterator - it = boost::next(intersections.begin()), + it = std::next(intersections.begin()), end = intersections.end(); it != end; ++it) { diff --git a/Polyhedron/demo/Polyhedron/include/id_printing.h b/Polyhedron/demo/Polyhedron/include/id_printing.h index 46d142a24bb..5676f1129df 100644 --- a/Polyhedron/demo/Polyhedron/include/id_printing.h +++ b/Polyhedron/demo/Polyhedron/include/id_printing.h @@ -155,7 +155,7 @@ bool find_primitive_id(const QPoint& point, const Point* closest_point = boost::get(&closest->first); for(typename Intersections::iterator - it = boost::next(intersections.begin()), + it = std::next(intersections.begin()), end = intersections.end(); it != end; ++it) { diff --git a/Polyline_simplification_2/include/CGAL/Polyline_simplification_2/Hybrid_squared_distance_cost.h b/Polyline_simplification_2/include/CGAL/Polyline_simplification_2/Hybrid_squared_distance_cost.h index 850ff94fbd0..fd1e9ccc0de 100644 --- a/Polyline_simplification_2/include/CGAL/Polyline_simplification_2/Hybrid_squared_distance_cost.h +++ b/Polyline_simplification_2/include/CGAL/Polyline_simplification_2/Hybrid_squared_distance_cost.h @@ -66,7 +66,7 @@ public: typedef typename Constrained_triangulation_plus_2::Vertices_in_constraint_iterator Vertices_in_constraint_iterator; Vertices_in_constraint_iterator vicp = std::prev(vicq); - Vertices_in_constraint_iterator vicr = boost::next(vicq); + Vertices_in_constraint_iterator vicr = std::next(vicq); Point const& lP = (*vicp)->point(); Point const& lR = (*vicr)->point(); diff --git a/Polyline_simplification_2/include/CGAL/Polyline_simplification_2/Scaled_squared_distance_cost.h b/Polyline_simplification_2/include/CGAL/Polyline_simplification_2/Scaled_squared_distance_cost.h index 30a7b2cf00c..8a697736461 100644 --- a/Polyline_simplification_2/include/CGAL/Polyline_simplification_2/Scaled_squared_distance_cost.h +++ b/Polyline_simplification_2/include/CGAL/Polyline_simplification_2/Scaled_squared_distance_cost.h @@ -62,7 +62,7 @@ public: typedef typename Constrained_triangulation_plus_2::Vertices_in_constraint_iterator Vertices_in_constraint_iterator; Vertices_in_constraint_iterator vicp = std::prev(vicq); - Vertices_in_constraint_iterator vicr = boost::next(vicq); + Vertices_in_constraint_iterator vicr = std::next(vicq); Point const& lP = (*vicp)->point(); Point const& lR = (*vicr)->point(); diff --git a/Polyline_simplification_2/include/CGAL/Polyline_simplification_2/Squared_distance_cost.h b/Polyline_simplification_2/include/CGAL/Polyline_simplification_2/Squared_distance_cost.h index 92aa449bfde..4110a771821 100644 --- a/Polyline_simplification_2/include/CGAL/Polyline_simplification_2/Squared_distance_cost.h +++ b/Polyline_simplification_2/include/CGAL/Polyline_simplification_2/Squared_distance_cost.h @@ -67,7 +67,7 @@ public: typedef typename Constrained_triangulation_plus_2::Vertices_in_constraint_iterator Vertices_in_constraint_iterator; Vertices_in_constraint_iterator vicp = std::prev(vicq); - Vertices_in_constraint_iterator vicr = boost::next(vicq); + Vertices_in_constraint_iterator vicr = std::next(vicq); Point const& lP = (*vicp)->point(); Point const& lR = (*vicr)->point(); 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 e77c07e351e..85404f86c2d 100644 --- a/Polyline_simplification_2/include/CGAL/Polyline_simplification_2/simplify.h +++ b/Polyline_simplification_2/include/CGAL/Polyline_simplification_2/simplify.h @@ -154,7 +154,7 @@ public: (*it)->set_removable(false); ++it; for(; it != ite; ++it){ - if((boost::next(it) != ite) && (std::prev(it)== boost::next(it))){ + if((std::next(it) != ite) && (std::prev(it)== std::next(it))){ (*it)->set_removable(false); } } @@ -247,7 +247,7 @@ public: Vertex_handle vh = *it; Vertices_in_constraint_iterator u = std::prev(it); Vertex_handle uh = *u; - Vertices_in_constraint_iterator w = boost::next(it); + Vertices_in_constraint_iterator w = std::next(it); Vertex_handle wh = *w; typename Geom_traits::Orientation_2 orientation_2 = pct.geom_traits().orientation_2_object(); @@ -322,7 +322,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 = boost::next(vit); + Vertices_in_constraint_iterator u = std::prev(vit), w = std::next(vit); pct.simplify(vit); if((*u)->is_removable()){ diff --git a/STL_Extension/test/STL_Extension/test_skiplist.cpp b/STL_Extension/test/STL_Extension/test_skiplist.cpp index 6405dff5d2f..0e0cf9a9c20 100644 --- a/STL_Extension/test/STL_Extension/test_skiplist.cpp +++ b/STL_Extension/test/STL_Extension/test_skiplist.cpp @@ -60,10 +60,10 @@ BOOST_FIXTURE_TEST_CASE( test_insert, Fixture ) skips.begin(), skips.end()); // the same goes for inserting at an arbitrary position - skip::all_iterator pos = boost::next(l.all_begin(), 3); - l.insert(boost::next(l.all_begin(), 3) + skip::all_iterator pos = std::next(l.all_begin(), 3); + l.insert(std::next(l.all_begin(), 3) , 20); - all.insert(boost::next(all.begin(), 3) + all.insert(std::next(all.begin(), 3) , 20); BOOST_CHECK_EQUAL_COLLECTIONS(l.skip_begin(), l.skip_end(), skips.begin(), skips.end()); @@ -79,8 +79,8 @@ BOOST_FIXTURE_TEST_CASE( test_single_skip, Fixture ) // skip somewhere in between and at the end // skip 2 and 7 - l.skip(boost::next(l.all_begin())); - BOOST_CHECK(l.is_skipped(boost::next(l.all_begin()))); + l.skip(std::next(l.all_begin())); + BOOST_CHECK(l.is_skipped(std::next(l.all_begin()))); skips.erase(std::remove(skips.begin(), skips.end(), 2), skips.end()); BOOST_CHECK_EQUAL_COLLECTIONS(l.skip_begin(), l.skip_end(), skips.begin(), skips.end()); @@ -106,7 +106,7 @@ BOOST_FIXTURE_TEST_CASE( test_single_skip, Fixture ) BOOST_FIXTURE_TEST_CASE( test_range_skip, Fixture ) { // drop all from 2 up to 4 - l.skip(boost::next(l.all_begin()), boost::next(l.all_begin(), 3)); + l.skip(std::next(l.all_begin()), std::next(l.all_begin(), 3)); skips.erase(std::remove(skips.begin(), skips.end(), 2), skips.end()); skips.erase(std::remove(skips.begin(), skips.end(), 3), skips.end()); BOOST_CHECK_EQUAL_COLLECTIONS(l.skip_begin(), l.skip_end(), @@ -137,20 +137,20 @@ BOOST_AUTO_TEST_CASE( test_continous_insert ) BOOST_FIXTURE_TEST_CASE( test_unskip, Fixture ) { // skip 2 and 3 - l.skip(boost::next(l.all_begin()), boost::next(l.all_begin(), 3)); + l.skip(std::next(l.all_begin()), std::next(l.all_begin(), 3)); skips.erase(std::remove(skips.begin(), skips.end(), 2), skips.end()); skips.erase(std::remove(skips.begin(), skips.end(), 3), skips.end()); BOOST_CHECK_EQUAL_COLLECTIONS(l.skip_begin(), l.skip_end(), skips.begin(), skips.end()); // unskip 2 - l.unskip(boost::next(l.skip_begin()), boost::next(l.all_begin())); - skips.insert(boost::next(skips.begin()), 2); + l.unskip(std::next(l.skip_begin()), std::next(l.all_begin())); + skips.insert(std::next(skips.begin()), 2); BOOST_CHECK_EQUAL_COLLECTIONS(l.skip_begin(), l.skip_end(), skips.begin(), skips.end()); // unskip 3 - l.unskip(boost::next(l.skip_begin(), 2), boost::next(l.all_begin(), 2)); - skips.insert(boost::next(skips.begin(), 2), 3); + l.unskip(std::next(l.skip_begin(), 2), std::next(l.all_begin(), 2)); + skips.insert(std::next(skips.begin(), 2), 3); BOOST_CHECK_EQUAL_COLLECTIONS(l.skip_begin(), l.skip_end(), skips.begin(), skips.end()); @@ -181,8 +181,8 @@ BOOST_FIXTURE_TEST_CASE( test_push, Fixture ) all.begin(), all.end()); // check how it works with skipped elements - l.skip(l.all_begin(), boost::next(l.all_begin(), 4)); - skips.erase(skips.begin(), boost::next(skips.begin(), 4)); + l.skip(l.all_begin(), std::next(l.all_begin(), 4)); + skips.erase(skips.begin(), std::next(skips.begin(), 4)); l.push_front(20); l.push_front(21); skips.insert(skips.begin(), 20); @@ -206,7 +206,7 @@ BOOST_FIXTURE_TEST_CASE( test_implicit_conversion, Fixture ) BOOST_FIXTURE_TEST_CASE( test_erase, Fixture ) { // erase 3 - l.erase(boost::next(l.all_begin(), 2)); + l.erase(std::next(l.all_begin(), 2)); skips.erase(std::remove(skips.begin(), skips.end(), 3), skips.end()); all.erase(std::remove(all.begin(), all.end(), 3), all.end()); BOOST_CHECK_EQUAL_COLLECTIONS(l.skip_begin(), l.skip_end(), @@ -215,10 +215,10 @@ BOOST_FIXTURE_TEST_CASE( test_erase, Fixture ) all.begin(), all.end()); // skip 2 first and then erase it - l.skip(boost::next(l.all_begin())); + l.skip(std::next(l.all_begin())); skips.erase(std::remove(skips.begin(), skips.end(), 2), skips.end()); all.erase(std::remove(all.begin(), all.end(), 2), all.end()); - l.erase(boost::next(l.all_begin())); + l.erase(std::next(l.all_begin())); BOOST_CHECK_EQUAL_COLLECTIONS(l.skip_begin(), l.skip_end(), skips.begin(), skips.end()); BOOST_CHECK_EQUAL_COLLECTIONS(l.all_begin(), l.all_end(), @@ -250,10 +250,10 @@ BOOST_AUTO_TEST_CASE( test_swap ) BOOST_AUTO_TEST_CASE( test_splice ) { Fixture a, b; - a.all.insert(boost::next(a.all.begin()), b.all.begin(), b.all.end()); - a.skips.insert(boost::next(a.skips.begin()), b.skips.begin(), b.skips.end()); + a.all.insert(std::next(a.all.begin()), b.all.begin(), b.all.end()); + a.skips.insert(std::next(a.skips.begin()), b.skips.begin(), b.skips.end()); - a.l.splice(boost::next(a.l.skip_begin()), b.l, b.l.skip_begin(), b.l.skip_end()); + a.l.splice(std::next(a.l.skip_begin()), b.l, b.l.skip_begin(), b.l.skip_end()); BOOST_CHECK_EQUAL_COLLECTIONS(a.l.all_begin(), a.l.all_end(), a.all.begin(), a.all.end()); diff --git a/Spatial_searching/include/CGAL/Spatial_searching/internal/bounded_priority_queue.h b/Spatial_searching/include/CGAL/Spatial_searching/internal/bounded_priority_queue.h index 4ef263f5916..58eae6b11ed 100644 --- a/Spatial_searching/include/CGAL/Spatial_searching/internal/bounded_priority_queue.h +++ b/Spatial_searching/include/CGAL/Spatial_searching/internal/bounded_priority_queue.h @@ -124,7 +124,7 @@ public: void sort() { -std::sort(m_data.begin(), boost::next(m_data.begin(),m_count), m_comp); +std::sort(m_data.begin(), std::next(m_data.begin(),m_count), m_comp); } protected: diff --git a/TDS_2/include/CGAL/boost/graph/internal/graph_traits_2D_TDS_helper.h b/TDS_2/include/CGAL/boost/graph/internal/graph_traits_2D_TDS_helper.h index d710a027cf2..9b5f303250d 100644 --- a/TDS_2/include/CGAL/boost/graph/internal/graph_traits_2D_TDS_helper.h +++ b/TDS_2/include/CGAL/boost/graph/internal/graph_traits_2D_TDS_helper.h @@ -285,7 +285,7 @@ public: namespace std { -// workaround a bug detected on at least g++ 4.4 where boost::next(Iterator) +// workaround a bug detected on at least g++ 4.4 where std::next(Iterator) // is picked as a candidate for next(h,g) template struct iterator_traits< CGAL::internal::TDS2_halfedge_descriptor > diff --git a/Triangulation_2/include/CGAL/Constrained_triangulation_plus_2.h b/Triangulation_2/include/CGAL/Constrained_triangulation_plus_2.h index f37ee350689..c3cd6d187de 100644 --- a/Triangulation_2/include/CGAL/Constrained_triangulation_plus_2.h +++ b/Triangulation_2/include/CGAL/Constrained_triangulation_plus_2.h @@ -754,7 +754,7 @@ public: void simplify(Vertices_in_constraint_iterator v) { Vertices_in_constraint_iterator u = std::prev(v); - Vertices_in_constraint_iterator w = boost::next(v); + Vertices_in_constraint_iterator w = std::next(v); bool unew = (*u != *w); hierarchy.simplify(u,v,w); diff --git a/Triangulation_2/include/CGAL/Triangulation_2/internal/Polyline_constraint_hierarchy_2.h b/Triangulation_2/include/CGAL/Triangulation_2/internal/Polyline_constraint_hierarchy_2.h index 8154e26251c..2280ed0cf9e 100644 --- a/Triangulation_2/include/CGAL/Triangulation_2/internal/Polyline_constraint_hierarchy_2.h +++ b/Triangulation_2/include/CGAL/Triangulation_2/internal/Polyline_constraint_hierarchy_2.h @@ -612,7 +612,7 @@ void Polyline_constraint_hierarchy_2::simplify(Vertex_it uc, // Remove the list item which points to v Vertex_list* vertex_list = it->id().vl_ptr(); Vertex_it vc_in_context = it->current(); - vc_in_context = boost::next(vc_in_context); + vc_in_context = std::next(vc_in_context); vertex_list->skip(vc_in_context.base()); ++it; } @@ -625,7 +625,7 @@ void Polyline_constraint_hierarchy_2::simplify(Vertex_it uc, // Remove the list item which points to v Vertex_list* vertex_list = it->id().vl_ptr(); Vertex_it vc_in_context = it->current(); - vc_in_context = boost::next(vc_in_context); + vc_in_context = std::next(vc_in_context); vertex_list->skip(vc_in_context.base()); ++it; }