diff --git a/Classification/include/CGAL/Classification/Feature/Color_channel.h b/Classification/include/CGAL/Classification/Feature/Color_channel.h index 87c4dfa2394..2024c8706e3 100644 --- a/Classification/include/CGAL/Classification/Feature/Color_channel.h +++ b/Classification/include/CGAL/Classification/Feature/Color_channel.h @@ -99,7 +99,7 @@ public: /// \cond SKIP_IN_MANUAL virtual float value (std::size_t pt_index) { - cpp11::array c = get(color_map, *(input.begin()+pt_index)).to_hsv(); + std::array c = get(color_map, *(input.begin()+pt_index)).to_hsv(); return float(c[std::size_t(m_channel)]); } /// \endcond diff --git a/GraphicsView/demo/Apollonius_graph_2/Apollonius_graph_2.cpp b/GraphicsView/demo/Apollonius_graph_2/Apollonius_graph_2.cpp index c41b84b8682..c97a51fe090 100644 --- a/GraphicsView/demo/Apollonius_graph_2/Apollonius_graph_2.cpp +++ b/GraphicsView/demo/Apollonius_graph_2/Apollonius_graph_2.cpp @@ -244,7 +244,7 @@ MainWindow::open(QString fileName) #if BOOST_VERSION >= 105600 && (! defined(BOOST_GCC) || BOOST_GCC >= 40500) std::vector point_3_s; CGAL::read_multi_point_WKT(ifs, point_3_s); - BOOST_FOREACH(const K::Point_3& point_3, point_3_s) + for(const K::Point_3& point_3 : point_3_s) { points.push_back(Apollonius_site_2(K::Point_2(point_3.x(), point_3.y()), point_3.z())); } diff --git a/GraphicsView/demo/Bounding_volumes/Bounding_volumes.cpp b/GraphicsView/demo/Bounding_volumes/Bounding_volumes.cpp index 45e25999ed1..9cd70810ec0 100644 --- a/GraphicsView/demo/Bounding_volumes/Bounding_volumes.cpp +++ b/GraphicsView/demo/Bounding_volumes/Bounding_volumes.cpp @@ -499,7 +499,7 @@ MainWindow::open(QString fileName) { #if BOOST_VERSION >= 105600 && (! defined(BOOST_GCC) || BOOST_GCC >= 40500) CGAL::read_multi_point_WKT(ifs, points); - BOOST_FOREACH(K::Point_2 p, points) + for(K::Point_2 p : points) { mc.insert(p); me.insert(p); diff --git a/GraphicsView/demo/Segment_Delaunay_graph_2/Segment_voronoi_2.cpp b/GraphicsView/demo/Segment_Delaunay_graph_2/Segment_voronoi_2.cpp index 7399174b30a..4694a2a496c 100644 --- a/GraphicsView/demo/Segment_Delaunay_graph_2/Segment_voronoi_2.cpp +++ b/GraphicsView/demo/Segment_Delaunay_graph_2/Segment_voronoi_2.cpp @@ -358,7 +358,7 @@ MainWindow::loadWKTConstraints(QString do{ std::vector polygons; CGAL::read_multi_polygon_WKT(ifs, polygons); - BOOST_FOREACH(const Polygon& poly, polygons) + for(const Polygon& poly : polygons) { if(poly.outer_boundary().is_empty()) continue; @@ -388,7 +388,7 @@ MainWindow::loadWKTConstraints(QString do{ std::vector linestrings; CGAL::read_multi_linestring_WKT(ifs, linestrings); - BOOST_FOREACH(const LineString& ls, linestrings) + for(const LineString& ls : linestrings) { bool first_pass=true; LineString::const_iterator it = ls.begin(); diff --git a/GraphicsView/demo/Segment_Delaunay_graph_Linf_2/Segment_voronoi_linf_2.cpp b/GraphicsView/demo/Segment_Delaunay_graph_Linf_2/Segment_voronoi_linf_2.cpp index ee5ee603726..4b4c74514ff 100644 --- a/GraphicsView/demo/Segment_Delaunay_graph_Linf_2/Segment_voronoi_linf_2.cpp +++ b/GraphicsView/demo/Segment_Delaunay_graph_Linf_2/Segment_voronoi_linf_2.cpp @@ -401,7 +401,7 @@ MainWindow::loadWKT(QString { std::vector mpts; CGAL::read_multi_point_WKT(ifs, mpts); - BOOST_FOREACH(const K::Point_2& p, mpts) + for(const K::Point_2& p : mpts) svd.insert(p); }while(ifs.good() && !ifs.eof()); //Lines @@ -412,7 +412,7 @@ MainWindow::loadWKT(QString typedef std::vector LineString; std::vector mls; CGAL::read_multi_linestring_WKT(ifs, mls); - BOOST_FOREACH(const LineString& ls, mls) + for(const LineString& ls : mls) { if(ls.empty()) continue; @@ -450,7 +450,7 @@ MainWindow::loadWKT(QString typedef CGAL::Polygon_with_holes_2 Polygon; std::vector mps; CGAL::read_multi_polygon_WKT(ifs, mps); - BOOST_FOREACH(const Polygon& poly, mps) + for(const Polygon& poly : mps) { if(poly.outer_boundary().is_empty()) continue; diff --git a/GraphicsView/demo/Snap_rounding_2/Snap_rounding_2.cpp b/GraphicsView/demo/Snap_rounding_2/Snap_rounding_2.cpp index 4be765f84c8..cd337a2b470 100644 --- a/GraphicsView/demo/Snap_rounding_2/Snap_rounding_2.cpp +++ b/GraphicsView/demo/Snap_rounding_2/Snap_rounding_2.cpp @@ -273,7 +273,7 @@ MainWindow::open(QString fileName) #if BOOST_VERSION >= 105600 && (! defined(BOOST_GCC) || BOOST_GCC >= 40500) std::vector > mls; CGAL::read_multi_linestring_WKT(ifs, mls); - BOOST_FOREACH(const std::vector& ls, mls) + for(const std::vector& ls : mls) { if(ls.size() > 2) continue; @@ -315,7 +315,7 @@ MainWindow::on_actionSaveSegments_triggered() { #if BOOST_VERSION >= 105600 && (! defined(BOOST_GCC) || BOOST_GCC >= 40500) std::vector >mls; - BOOST_FOREACH(const Segment_2& seg, input) + for(const Segment_2& seg : input) { std::vector ls(2); ls[0] = seg.source(); diff --git a/GraphicsView/demo/Triangulation_2/Constrained_Delaunay_triangulation_2.cpp b/GraphicsView/demo/Triangulation_2/Constrained_Delaunay_triangulation_2.cpp index 008e227d28c..697b6ca1e00 100644 --- a/GraphicsView/demo/Triangulation_2/Constrained_Delaunay_triangulation_2.cpp +++ b/GraphicsView/demo/Triangulation_2/Constrained_Delaunay_triangulation_2.cpp @@ -572,12 +572,12 @@ MainWindow::loadWKT(QString typedef CGAL::Point_2 Point; std::vector mps; CGAL::read_multi_polygon_WKT(ifs, mps); - BOOST_FOREACH(const Polygon& p, mps) + for(const Polygon& p : mps) { if(p.outer_boundary().is_empty()) continue; - BOOST_FOREACH(Point point, p.outer_boundary().container()) + for(Point point : p.outer_boundary().container()) cdt.insert(point); for(Polygon::General_polygon_2::Edge_const_iterator e_it=p.outer_boundary().edges_begin(); e_it != p.outer_boundary().edges_end(); ++e_it) @@ -586,7 +586,7 @@ MainWindow::loadWKT(QString for(Polygon::Hole_const_iterator h_it = p.holes_begin(); h_it != p.holes_end(); ++h_it) { - BOOST_FOREACH(Point point, h_it->container()) + for(Point point : h_it->container()) cdt.insert(point); for(Polygon::General_polygon_2::Edge_const_iterator e_it=h_it->edges_begin(); e_it != h_it->edges_end(); ++e_it) @@ -604,7 +604,7 @@ MainWindow::loadWKT(QString typedef std::vector LineString; std::vector mls; CGAL::read_multi_linestring_WKT(ifs, mls); - BOOST_FOREACH(const LineString& ls, mls) + for(const LineString& ls : mls) { if(ls.empty()) continue; @@ -642,7 +642,7 @@ MainWindow::loadWKT(QString { std::vector mpts; CGAL::read_multi_point_WKT(ifs, mpts); - BOOST_FOREACH(const K::Point_2& p, mpts) + for(const K::Point_2& p : mpts) { cdt.insert(p); } diff --git a/GraphicsView/demo/Triangulation_2/Regular_triangulation_2.cpp b/GraphicsView/demo/Triangulation_2/Regular_triangulation_2.cpp index ca1023d4b1d..002050f4952 100644 --- a/GraphicsView/demo/Triangulation_2/Regular_triangulation_2.cpp +++ b/GraphicsView/demo/Triangulation_2/Regular_triangulation_2.cpp @@ -260,7 +260,7 @@ MainWindow::on_actionLoadPoints_triggered() #if BOOST_VERSION >= 105600 && (! defined(BOOST_GCC) || BOOST_GCC >= 40500) std::vector points_3; CGAL::read_multi_point_WKT(ifs, points_3); - BOOST_FOREACH(const K::Point_3& p, points_3) + for(const K::Point_3& p : points_3) { points.push_back(Weighted_point_2(K::Point_2(p.x(), p.y()), p.z())); } diff --git a/NewKernel_d/include/CGAL/NewKernel_d/Lazy_cartesian.h b/NewKernel_d/include/CGAL/NewKernel_d/Lazy_cartesian.h index e49ba75d9d1..5e0e24254fe 100644 --- a/NewKernel_d/include/CGAL/NewKernel_d/Lazy_cartesian.h +++ b/NewKernel_d/include/CGAL/NewKernel_d/Lazy_cartesian.h @@ -30,7 +30,7 @@ struct Nth_iterator_element : private Store_kernel { typedef typename Get_type::value_tag>::type result_type; template result_type operator()(U&& u, int i) const { typename Get_functor >::type ci(this->kernel()); - return *cpp0x::next(ci(std::forward(u),Begin_tag()),i); + return *std::next(ci(std::forward(u),Begin_tag()),i); } }; //typedef typename Functor::nth_element>::type nth_elem; diff --git a/Point_set_3/examples/Point_set_3/point_set_algo.cpp b/Point_set_3/examples/Point_set_3/point_set_algo.cpp index 80e42dcef6d..f87a4b3e4ef 100644 --- a/Point_set_3/examples/Point_set_3/point_set_algo.cpp +++ b/Point_set_3/examples/Point_set_3/point_set_algo.cpp @@ -70,7 +70,7 @@ int main (int, char**) parameters.normal_threshold = 0.9; ransac.detect(parameters); - BOOST_FOREACH(boost::shared_ptr shape, ransac.shapes()) + for(boost::shared_ptr shape : ransac.shapes()) if (Sphere* sphere = dynamic_cast(shape.get())) std::cerr << "Detected sphere of center " << sphere->center() // Center should be approx 0, 0, 0 << " and of radius " << sphere->radius() << std::endl; // Radius should be approx 1 diff --git a/Polygon/include/CGAL/Polygon_2.h b/Polygon/include/CGAL/Polygon_2.h index 290a6a5a6e6..e18bf7bde52 100644 --- a/Polygon/include/CGAL/Polygon_2.h +++ b/Polygon/include/CGAL/Polygon_2.h @@ -445,7 +445,7 @@ class Polygon_2 { Point_2& vertex(std::size_t i) { CGAL_precondition( i < d_container.size() ); - return *(cpp11::next(d_container.begin(), i)); + return *(std::next(d_container.begin(), i)); } /// Returns a reference to the `i`-th vertex. Point_2& operator[](std::size_t i) diff --git a/Polygon_mesh_processing/include/CGAL/Polygon_mesh_processing/internal/Corefinement/Face_graph_output_builder.h b/Polygon_mesh_processing/include/CGAL/Polygon_mesh_processing/internal/Corefinement/Face_graph_output_builder.h index 3e585fe691c..2f93d176784 100644 --- a/Polygon_mesh_processing/include/CGAL/Polygon_mesh_processing/internal/Corefinement/Face_graph_output_builder.h +++ b/Polygon_mesh_processing/include/CGAL/Polygon_mesh_processing/internal/Corefinement/Face_graph_output_builder.h @@ -1259,7 +1259,7 @@ public: // non-manifold vertices would not be duplicated in interior // vertices of patche) // special code to handle non-manifold vertices on the boundary - BOOST_FOREACH (vertex_descriptor vd, vertices(tm1)) + for (vertex_descriptor vd : vertices(tm1)) { boost::optional op_h = is_border(vd, tm1); if (op_h == boost::none) continue; @@ -1629,12 +1629,12 @@ public: } // Code dedicated to the handling of non-manifold vertices - BOOST_FOREACH(vertex_descriptor vd, border_nm_vertices) + for(vertex_descriptor vd : border_nm_vertices) { // first check if at least one incident patch will be kept boost::unordered_set id_p_rm; bool all_removed=true; - BOOST_FOREACH(halfedge_descriptor h, halfedges_around_target(vd, tm1)) + for(halfedge_descriptor h : halfedges_around_target(vd, tm1)) { face_descriptor f = face(h, tm1); if ( f != GT::null_face() ) @@ -1649,7 +1649,7 @@ public: if (all_removed) id_p_rm.erase(id_p_rm.begin()); // remove the vertex from the interior vertices of patches to be removed - BOOST_FOREACH(std::size_t pid, id_p_rm) + for(std::size_t pid : id_p_rm) patches_of_tm1[pid].interior_vertices.erase(vd); // we now need to update the next/prev relationship induced by the future removal of patches @@ -1694,7 +1694,7 @@ public: else { // we push-back the halfedge for the next round only if it was not the first - if (h != *cpp11::prev(hit)) + if (h != *std::prev(hit)) --hit; break; } @@ -1703,7 +1703,7 @@ public: while(true); if (hit == end) break; } - BOOST_FOREACH ( const Hedge_pair& p, hedges_to_link) + for(const Hedge_pair& p : hedges_to_link) set_next(p.first, p.second, tm1); } } diff --git a/Polygon_mesh_processing/test/Polygon_mesh_processing/polygon_mesh_slicer_test.cpp b/Polygon_mesh_processing/test/Polygon_mesh_processing/polygon_mesh_slicer_test.cpp index 223a1c58aa0..526bea44ee6 100644 --- a/Polygon_mesh_processing/test/Polygon_mesh_processing/polygon_mesh_slicer_test.cpp +++ b/Polygon_mesh_processing/test/Polygon_mesh_processing/polygon_mesh_slicer_test.cpp @@ -28,7 +28,7 @@ bool is_ccw(int xi, int yi, CGAL::Polygon_2 polygon; if(polyline.front() == polyline.back()) { - BOOST_FOREACH(const typename K::Point_3& p, polyline) + for(const typename K::Point_3& p : polyline) { polygon.push_back(typename K::Point_2(p[xi], p[yi])); } diff --git a/Polygon_mesh_processing/test/Polygon_mesh_processing/test_pmp_clip.cpp b/Polygon_mesh_processing/test/Polygon_mesh_processing/test_pmp_clip.cpp index e94e16c511b..f330133421e 100644 --- a/Polygon_mesh_processing/test/Polygon_mesh_processing/test_pmp_clip.cpp +++ b/Polygon_mesh_processing/test/Polygon_mesh_processing/test_pmp_clip.cpp @@ -296,7 +296,7 @@ void test() ss.str(std::string()); ss << "OFF\n 7 4 0\n 0 0 0\n2 0 0\n4 0 0\n4 1 0\n0 1 0\n3 1 0\n 1 1 0\n3 0 1 4\n3 1 2 3\n3 1 5 6\n3 1 3 5\n"; ss >> tm1; - CGAL::Euler::remove_face(halfedge(*CGAL::cpp11::prev(faces(tm1).end()),tm1),tm1); + CGAL::Euler::remove_face(halfedge(*std::prev(faces(tm1).end()),tm1),tm1); PMP::clip(tm1, K::Plane_3(-1,0,0,2)); assert(vertices(tm1).size()==6); CGAL::clear(tm1); @@ -305,7 +305,7 @@ void test() ss << "OFF\n 9 7 0\n 0 0 0\n2 0 0\n4 0 0\n4 1 0\n0 1 0\n3 1 0\n 1 1 0\n3 -1 0\n1 -1 0\n3 0 1 4\n3 1 2 3\n3 1 5 6\n3 1 8 7\n3 1 3 5\n3 1 6 4\n3 1 0 8\n"; ss >> tm1; for (int i=0;i<3;++i) - CGAL::Euler::remove_face(halfedge(*CGAL::cpp11::prev(faces(tm1).end()),tm1),tm1); + CGAL::Euler::remove_face(halfedge(*std::prev(faces(tm1).end()),tm1),tm1); PMP::clip(tm1, K::Plane_3(-1,0,0,2)); assert(vertices(tm1).size()==7); CGAL::clear(tm1); @@ -314,7 +314,7 @@ void test() ss << "OFF\n 9 7 0\n 0 0 0\n2 0 0\n4 0 0\n4 1 0\n0 1 0\n3 1 0\n 1 1 0\n3 -1 0\n1 -1 0\n3 0 1 4\n3 1 2 3\n3 1 5 6\n3 1 8 7\n3 1 3 5\n3 1 6 4\n3 1 0 8\n"; ss >> tm1; for (int i=0;i<3;++i) - CGAL::Euler::remove_face(halfedge(*CGAL::cpp11::prev(faces(tm1).end()),tm1),tm1); + CGAL::Euler::remove_face(halfedge(*std::prev(faces(tm1).end()),tm1),tm1); PMP::clip(tm1, K::Plane_3(0,1,0,0)); assert(vertices(tm1).size()==3); CGAL::clear(tm1); @@ -323,7 +323,7 @@ void test() ss << "OFF\n 9 7 0\n 0 0 0\n2 0 0\n4 0 0\n4 1 0\n0 1 0\n3 1 0\n 1 1 0\n3 -1 0\n1 -1 0\n3 0 1 4\n3 1 2 3\n3 1 5 6\n3 1 8 7\n3 1 3 5\n3 1 6 4\n3 1 0 8\n"; ss >> tm1; for (int i=0;i<3;++i) - CGAL::Euler::remove_face(halfedge(*CGAL::cpp11::prev(faces(tm1).end()),tm1),tm1); + CGAL::Euler::remove_face(halfedge(*std::prev(faces(tm1).end()),tm1),tm1); PMP::clip(tm1, K::Plane_3(0,-1,0,0)); assert(vertices(tm1).size()==7); CGAL::clear(tm1); diff --git a/Polygon_mesh_processing/test/Polygon_mesh_processing/test_pmp_manifoldness.cpp b/Polygon_mesh_processing/test/Polygon_mesh_processing/test_pmp_manifoldness.cpp index 788a22e428a..c4b8a98d2fa 100644 --- a/Polygon_mesh_processing/test/Polygon_mesh_processing/test_pmp_manifoldness.cpp +++ b/Polygon_mesh_processing/test/Polygon_mesh_processing/test_pmp_manifoldness.cpp @@ -6,8 +6,6 @@ #include #include -#include - #include #include #include diff --git a/Polyhedron/demo/Polyhedron/Plugins/AABB_tree/Cut_plugin.cpp b/Polyhedron/demo/Polyhedron/Plugins/AABB_tree/Cut_plugin.cpp index ca66b7ce18a..d7a3863ce3a 100644 --- a/Polyhedron/demo/Polyhedron/Plugins/AABB_tree/Cut_plugin.cpp +++ b/Polyhedron/demo/Polyhedron/Plugins/AABB_tree/Cut_plugin.cpp @@ -258,7 +258,7 @@ public: is_tree_empty = tree.empty(); nb_lines = positions_lines.size(); setEdgeContainer(0, new Ec(Vi::PROGRAM_NO_SELECTION, false)); - BOOST_FOREACH(auto v, CGAL::QGLViewer::QGLViewerPool()) + for(auto v : CGAL::QGLViewer::QGLViewerPool()) { CGAL::Three::Viewer_interface* viewer = static_cast(v); initGL(viewer); @@ -488,7 +488,7 @@ public: setEdgeContainer(0, new Ec(Vi::PROGRAM_NO_SELECTION, false)); texture = new ::Texture(m_grid_size,m_grid_size); getTriangleContainer(0)->setTextureSize(QSize(m_grid_size, m_grid_size)); - BOOST_FOREACH(auto v, CGAL::QGLViewer::QGLViewerPool()) + for(auto v : CGAL::QGLViewer::QGLViewerPool()) { CGAL::Three::Viewer_interface* viewer = static_cast(v); initGL(viewer); diff --git a/Polyhedron/demo/Polyhedron/Plugins/PCA/Affine_transform_plugin.cpp b/Polyhedron/demo/Polyhedron/Plugins/PCA/Affine_transform_plugin.cpp index b9766dec3ff..98851af36e8 100644 --- a/Polyhedron/demo/Polyhedron/Plugins/PCA/Affine_transform_plugin.cpp +++ b/Polyhedron/demo/Polyhedron/Plugins/PCA/Affine_transform_plugin.cpp @@ -64,7 +64,7 @@ public: bbox.xmax(),bbox.ymax(),bbox.zmax())); nb_points = points.size(); - BOOST_FOREACH(auto v, CGAL::QGLViewer::QGLViewerPool()) + for(auto v : CGAL::QGLViewer::QGLViewerPool()) { CGAL::Three::Viewer_interface* viewer = static_cast(v); initGL(viewer); diff --git a/Polyhedron/demo/Polyhedron/Plugins/Point_set/Alpha_shape_plugin.cpp b/Polyhedron/demo/Polyhedron/Plugins/Point_set/Alpha_shape_plugin.cpp index bda125617a5..86d819b5b21 100644 --- a/Polyhedron/demo/Polyhedron/Plugins/Point_set/Alpha_shape_plugin.cpp +++ b/Polyhedron/demo/Polyhedron/Plugins/Point_set/Alpha_shape_plugin.cpp @@ -305,7 +305,7 @@ Scene_alpha_shape_item::Scene_alpha_shape_item(Scene_points_with_normal_item *po vertices.push_back(it->point().y()+offset.y); vertices.push_back(it->point().z()+offset.z); } - BOOST_FOREACH(auto v, CGAL::QGLViewer::QGLViewerPool()) + for(auto v : CGAL::QGLViewer::QGLViewerPool()) { CGAL::Three::Viewer_interface* viewer = static_cast(v); if(!isInit(viewer)) diff --git a/Polyhedron/demo/Polyhedron/Scene_c3t3_item.cpp b/Polyhedron/demo/Polyhedron/Scene_c3t3_item.cpp index a1343e70134..9ad4cfa9dc2 100644 --- a/Polyhedron/demo/Polyhedron/Scene_c3t3_item.cpp +++ b/Polyhedron/demo/Polyhedron/Scene_c3t3_item.cpp @@ -532,7 +532,7 @@ void Scene_c3t3_item::common_constructor(bool is_surface) setEdgeContainer(Grid_edges, new Ec(Vi::PROGRAM_NO_SELECTION, false)); setEdgeContainer(C3t3_edges, new Ec(Vi::PROGRAM_C3T3_EDGES, false)); setPointContainer(C3t3_points, new Pc(Vi::PROGRAM_C3T3_EDGES, false)); - BOOST_FOREACH(auto v, CGAL::QGLViewer::QGLViewerPool()) + for(auto v : CGAL::QGLViewer::QGLViewerPool()) { v->installEventFilter(this); } @@ -611,7 +611,7 @@ void Scene_c3t3_item::updateCutPlane() if(!d) return; if(d->need_changed) { - BOOST_FOREACH(auto v, CGAL::QGLViewer::QGLViewerPool()) + for(auto v : CGAL::QGLViewer::QGLViewerPool()) { CGAL::Three::Viewer_interface* viewer = static_cast(v); d->are_intersection_buffers_filled[viewer] = false; @@ -1581,7 +1581,7 @@ Scene_c3t3_item::setColor(QColor c) d->compute_color_map(c); invalidateOpenGLBuffers(); d->invalidate_stats(); - BOOST_FOREACH(auto v, CGAL::QGLViewer::QGLViewerPool()) + for(auto v : CGAL::QGLViewer::QGLViewerPool()) { CGAL::Three::Viewer_interface* viewer = static_cast(v); d->are_intersection_buffers_filled[viewer] = false; @@ -1636,7 +1636,7 @@ void Scene_c3t3_item::show_intersection(bool b) d->intersection->setRenderingMode(renderingMode()); connect(d->intersection, SIGNAL(destroyed()), this, SLOT(reset_intersection_item())); - BOOST_FOREACH(auto v, CGAL::QGLViewer::QGLViewerPool()) + for(auto v : CGAL::QGLViewer::QGLViewerPool()) { CGAL::Three::Viewer_interface* viewer = static_cast(v); d->are_intersection_buffers_filled[viewer] = false; diff --git a/Polyhedron/demo/Polyhedron/Scene_surface_mesh_item.cpp b/Polyhedron/demo/Polyhedron/Scene_surface_mesh_item.cpp index 09dd204eff6..a25bd48cadf 100644 --- a/Polyhedron/demo/Polyhedron/Scene_surface_mesh_item.cpp +++ b/Polyhedron/demo/Polyhedron/Scene_surface_mesh_item.cpp @@ -1295,7 +1295,7 @@ void Scene_surface_mesh_item::invalidate(Gl_data_names name) getEdgeContainer(0)->reset_vbos(name); getPointContainer(0)->reset_vbos(name); bool has_been_init = false; - BOOST_FOREACH(CGAL::QGLViewer* v, CGAL::QGLViewer::QGLViewerPool()) + for(CGAL::QGLViewer* v : CGAL::QGLViewer::QGLViewerPool()) { CGAL::Three::Viewer_interface* viewer = static_cast(v); if(!isInit(viewer)) diff --git a/Polyhedron/demo/Polyhedron/Scene_textured_surface_mesh_item.cpp b/Polyhedron/demo/Polyhedron/Scene_textured_surface_mesh_item.cpp index 816d37d3e60..8d9f55a455f 100644 --- a/Polyhedron/demo/Polyhedron/Scene_textured_surface_mesh_item.cpp +++ b/Polyhedron/demo/Polyhedron/Scene_textured_surface_mesh_item.cpp @@ -165,7 +165,7 @@ void Scene_textured_surface_mesh_item::common_constructor() setEdgeContainer(0, new Ec(Vi::PROGRAM_WITH_TEXTURED_EDGES, false));//edges getTriangleContainer(0)->setTextureSize(QSize(d->texture.GetWidth(), d->texture.GetHeight())); getEdgeContainer(0)->setTextureSize(QSize(d->texture.GetWidth(), d->texture.GetHeight())); - BOOST_FOREACH(auto v, CGAL::QGLViewer::QGLViewerPool()) + for(auto v : CGAL::QGLViewer::QGLViewerPool()) { CGAL::Three::Viewer_interface* viewer = static_cast(v); initGL(viewer); diff --git a/Polyhedron_IO/include/CGAL/IO/PLY_reader.h b/Polyhedron_IO/include/CGAL/IO/PLY_reader.h index 2700ac740ff..ada0165c981 100644 --- a/Polyhedron_IO/include/CGAL/IO/PLY_reader.h +++ b/Polyhedron_IO/include/CGAL/IO/PLY_reader.h @@ -266,7 +266,7 @@ namespace CGAL{ { has_uv = true; } - cpp11::tuple new_hedge; + std::tuple new_hedge; for (std::size_t j = 0; j < element.number_of_items(); ++ j) { for (std::size_t k = 0; k < element.number_of_properties(); ++ k) diff --git a/Polyline_simplification_2/demo/Polyline_simplification_2/Polyline_simplification_2.cpp b/Polyline_simplification_2/demo/Polyline_simplification_2/Polyline_simplification_2.cpp index 30a29401f2a..610fefba342 100644 --- a/Polyline_simplification_2/demo/Polyline_simplification_2/Polyline_simplification_2.cpp +++ b/Polyline_simplification_2/demo/Polyline_simplification_2/Polyline_simplification_2.cpp @@ -406,12 +406,12 @@ void MainWindow::loadWKT(QString if(! points.empty()){ std::cout << "Ignore " << points.size() << " isolated points" << std::endl; } - BOOST_FOREACH(LineString poly, polylines){ + for(LineString poly : polylines){ if ( poly.size() > 2 ){ m_pct.insert_constraint(poly.begin(), poly.end()); } } - BOOST_FOREACH(Polygon_with_holes_2 poly, polygons){ + for(Polygon_with_holes_2 poly : polygons){ m_pct.insert_constraint(poly.outer_boundary().vertices_begin(), poly.outer_boundary().vertices_end()); for(Polygon_with_holes_2::Hole_const_iterator it = poly.holes_begin(); it != poly.holes_end(); ++it){ const Polygon_2& hole = *it; diff --git a/STL_Extension/include/CGAL/Iterator_range.h b/STL_Extension/include/CGAL/Iterator_range.h index 06a71f09240..204d0cd1730 100644 --- a/STL_Extension/include/CGAL/Iterator_range.h +++ b/STL_Extension/include/CGAL/Iterator_range.h @@ -13,8 +13,8 @@ #define CGAL_ITERATOR_RANGE_H #include -#include #include +#include namespace CGAL { diff --git a/Stream_support/examples/Stream_support/Linestring_WKT.cpp b/Stream_support/examples/Stream_support/Linestring_WKT.cpp index 5c95562620a..ebc863f9ee3 100644 --- a/Stream_support/examples/Stream_support/Linestring_WKT.cpp +++ b/Stream_support/examples/Stream_support/Linestring_WKT.cpp @@ -6,7 +6,6 @@ #include #include -#include //must be included before WKT for some reason #include #include #include @@ -27,7 +26,7 @@ int main(int argc, char* argv[]) CGAL::read_linestring_WKT(is, ls); is.close(); } - BOOST_FOREACH(Point p, ls) + for(Point p : ls) std::cout< #include -#include - #include //typedef CGAL::Simple_cartesian Kernel; @@ -26,7 +24,7 @@ int main(int argc, char* argv[]) std::ifstream is((argc>1)?argv[1]:"data/multipoint.wkt"); MultiPoint mp; CGAL::read_multi_point_WKT(is, mp); - BOOST_FOREACH(const Point& p, mp) + for(const Point& p : mp) { std::cout< #include -#include - #include #include @@ -35,7 +33,7 @@ int main(int argc, char* argv[]) if(!p.outer_boundary().is_empty()) polys.push_back(p); }while(is.good() && !is.eof()); - BOOST_FOREACH(Polygon p, polys) + for(Polygon p : polys) std::cout<2)?argv[2]:"data/multipolygon.wkt"); MultiPolygon mp; CGAL::read_multi_polygon_WKT(is, mp); - BOOST_FOREACH(Polygon p, mp) + for(Polygon p : mp) std::cout< #include -#include - #include //typedef CGAL::Simple_cartesian Kernel; @@ -35,12 +33,12 @@ int main(int argc, char* argv[]) MultiPolygon polygons; CGAL::read_WKT(is, points,polylines,polygons); - BOOST_FOREACH(Point p, points) + for(Point p : points) std::cout< m_data; + std::array m_data; public: @@ -159,21 +159,21 @@ public: /*! returns the array with rgba values. */ - const cpp11::array& to_rgba() const { return m_data; } + const std::array& to_rgba() const { return m_data; } /*! returns the array with rgb values. */ - const cpp11::array& to_rgb() const + const std::array& to_rgb() const { - return reinterpret_cast&>(m_data); + return reinterpret_cast&>(m_data); } /*! computes the hsv (hue, saturation, value) values and returns an array representing them as float values between 0 and 1. */ - cpp11::array to_hsv() const + std::array to_hsv() const { double r = (double)(m_data[0]) / 255.; double g = (double)(m_data[1]) / 255.; diff --git a/Stream_support/test/Stream_support/test_read_WKT.cpp b/Stream_support/test/Stream_support/test_read_WKT.cpp index 0b550d76f34..fa0bb9b2c08 100644 --- a/Stream_support/test/Stream_support/test_read_WKT.cpp +++ b/Stream_support/test/Stream_support/test_read_WKT.cpp @@ -9,8 +9,6 @@ #include #include -#include - #include typedef CGAL::Exact_predicates_inexact_constructions_kernel Kernel; diff --git a/Stream_support/test/Stream_support/test_write_WKT.cpp b/Stream_support/test/Stream_support/test_write_WKT.cpp index 9586021beb9..ac602a67a93 100644 --- a/Stream_support/test/Stream_support/test_write_WKT.cpp +++ b/Stream_support/test/Stream_support/test_write_WKT.cpp @@ -11,8 +11,6 @@ #include #include -#include - #include typedef CGAL::Exact_predicates_inexact_constructions_kernel Kernel; diff --git a/Surface_mesh/examples/Surface_mesh/sm_draw_small_faces.cpp b/Surface_mesh/examples/Surface_mesh/sm_draw_small_faces.cpp index 3ab87459e1d..5d07f8a2dfa 100644 --- a/Surface_mesh/examples/Surface_mesh/sm_draw_small_faces.cpp +++ b/Surface_mesh/examples/Surface_mesh/sm_draw_small_faces.cpp @@ -4,7 +4,6 @@ #include #include #include -#include #include "draw_surface_mesh_small_faces.h" typedef CGAL::Simple_cartesian K; @@ -26,7 +25,7 @@ int main(int argc, char* argv[]) boost::tie(faces_size, created)=sm.add_property_map("f:size",0.); CGAL_assertion(created); - BOOST_FOREACH(face_descriptor fd, sm.faces()) + for(face_descriptor fd : sm.faces()) { faces_size[fd]=CGAL::Polygon_mesh_processing::face_area(fd, sm); } draw_surface_mesh_with_small_faces(sm); diff --git a/Surface_sweep_2/include/CGAL/Surface_sweep_2/Surface_sweep_2_impl.h b/Surface_sweep_2/include/CGAL/Surface_sweep_2/Surface_sweep_2_impl.h index e0379d49771..19ec5d88584 100644 --- a/Surface_sweep_2/include/CGAL/Surface_sweep_2/Surface_sweep_2_impl.h +++ b/Surface_sweep_2/include/CGAL/Surface_sweep_2/Surface_sweep_2_impl.h @@ -280,7 +280,7 @@ void Surface_sweep_2::_handle_overlaps_in_right_curves() Subcurve_iterator next_after = this->m_currentEvent->get_curve_after_on_right(it->first); for (std::size_t i=0; isecond[i], *cpp11::prev(next_after), this->m_currentEvent); + _intersect(it->second[i], *std::prev(next_after), this->m_currentEvent); CGAL_assertion(it->second.size()==nbc); // make sure the container was not updated } }