From ce126b87c6e1db0c9ea88a4bedb141a4da208c0f Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?S=C3=A9bastien=20Loriot?= Date: Wed, 20 Mar 2019 09:46:29 +0100 Subject: [PATCH] remove cpp11::copy_n, cpp11::prev, and cpp11::next and use std instead --- .../test/AABB_tree/aabb_any_all_benchmark.cpp | 2 +- .../AABB_tree/aabb_test_ray_intersection.cpp | 4 +- .../Algebraic_kernel_d/Interval_evaluate_1.h | 2 +- .../Algebraic_kernel_d/Interval_evaluate_2.h | 2 +- .../ex_alpha_projection_traits.cpp | 2 +- .../Alpha_shapes_2/ex_alpha_shapes_2.cpp | 2 +- .../ex_periodic_alpha_shapes_2.cpp | 2 +- .../test/Alpha_shapes_2/test_alpha.cpp | 2 +- BGL/test/BGL/test_Euler_operations.cpp | 4 +- .../Wachspress_coordinates_example.cpp | 2 +- .../boolean_operations_2.cpp | 2 +- .../bezier_traits_adapter2.cpp | 2 +- .../rectangular_p_center_2.cpp | 2 +- .../rectangular_p_center_2_random1_test.cpp | 2 +- .../rectangular_p_center_2_random2_test.cpp | 2 +- CGAL_ipelets/demo/CGAL_ipelets/generator.cpp | 6 +- .../benchmark/Convex_hull_2/static_ch2.cpp | 2 +- .../Convex_hull_2/ch_akl_toussaint_impl.h | 24 +++---- .../CGAL/Convex_hull_2/ch_bykat_impl.h | 10 +-- .../include/CGAL/Convex_hull_2/ch_eddy_impl.h | 8 +-- .../Convex_hull_2/ch_graham_andrew_impl.h | 4 +- .../Convex_hull_2/convexity_check_2_impl.h | 4 +- .../CGAL/segment_intersection_points_2.h | 2 +- .../compare_different_approach.cpp | 2 +- .../Convex_hull_3/is_on_positive_side.cpp | 2 +- .../demo/Convex_hull_3/quickhull_3_demo.cpp | 2 +- .../examples/Convex_hull_3/dynamic_hull_3.cpp | 2 +- .../Convex_hull_3/dynamic_hull_LCC_3.cpp | 2 +- .../Convex_hull_3/dynamic_hull_OM_3.cpp | 2 +- .../Convex_hull_3/dynamic_hull_SM_3.cpp | 2 +- .../dual/halfspace_intersection_3.h | 4 +- .../quickhull_degenerate_test_3.cpp | 2 +- .../test/Convex_hull_3/quickhull_test_3.cpp | 2 +- .../Filtered_kernel/orientation_3.cpp | 2 +- .../doc/Generator/CGAL/point_generators_2.h | 18 ++--- .../doc/Generator/CGAL/point_generators_3.h | 20 +++--- .../doc/Generator/CGAL/point_generators_d.h | 6 +- .../Generator/random_degenerate_point_set.cpp | 2 +- Generator/examples/Generator/random_grid.cpp | 2 +- .../random_points_in_tetrahedral_mesh_3.cpp | 2 +- .../random_points_in_triangles_2.cpp | 2 +- .../random_points_in_triangles_3.cpp | 2 +- .../random_points_on_tetrahedral_mesh_3.cpp | 2 +- .../random_points_on_triangle_mesh_2.cpp | 2 +- .../random_points_on_triangle_mesh_3.cpp | 2 +- ...ndom_points_tetrahedron_and_triangle_3.cpp | 4 +- .../Generator/random_points_triangle_2.cpp | 2 +- .../examples/Generator/random_segments1.cpp | 2 +- .../CGAL/random_convex_hull_in_disc_2.h | 2 +- Generator/include/CGAL/random_convex_set_2.h | 4 +- .../test/Generator/generic_random_test.cpp | 12 ++-- Generator/test/Generator/test_generators.cpp | 30 ++++---- .../test/Generator/test_tetrahedron_3.cpp | 6 +- Generator/test/Generator/test_triangle_2.cpp | 6 +- Generator/test/Generator/test_triangle_3.cpp | 6 +- GraphicsView/demo/Generator/Generator_2.cpp | 2 +- .../demo/Interpolation/surface_voronoi.cpp | 4 +- .../Interpolation/interpolation_2.cpp | 2 +- .../interpolation_vertex_with_info_2.cpp | 2 +- .../surface_neighbor_coordinates_3.cpp | 2 +- .../CGAL/_test_interpolation_functions_2.cpp | 4 +- .../CGAL/_test_surface_neighbors_3.cpp | 6 +- .../examples/Kernel_23/intersections.cpp | 2 +- .../convert_nef_polyhedron_to_polygon_mesh.h | 2 +- .../include/CGAL/NewKernel_d/Lazy_cartesian.h | 2 +- .../otr2_simplest_example.cpp | 2 +- .../otr2_simplest_example_with_tolerance.cpp | 2 +- .../otr2_epeck.cpp | 2 +- .../p2t2_hierarchy.cpp | 2 +- .../p4ht2_example_insertion.cpp | 2 +- .../test/Point_set_2/range_search_fcn.cpp | 2 +- .../test/Point_set_2/test_range_search.cpp | 2 +- .../callback_example.cpp | 2 +- .../voronoi_covariance_3.h | 2 +- Polygon/include/CGAL/Polygon_2.h | 4 +- .../Polygon_2/Polygon_2_algorithms_impl.h | 2 +- .../CGAL/Polygon_mesh_processing/border.h | 2 +- .../CGAL/Polygon_mesh_processing/distance.h | 8 +-- .../Corefinement/Face_graph_output_builder.h | 2 +- .../internal/Corefinement/intersection_impl.h | 6 +- .../merge_border_vertices.h | 4 +- .../Polygon_mesh_processing/orientation.h | 2 +- .../polygon_soup_to_polygon_mesh.h | 2 +- .../CGAL/Polygon_mesh_processing/repair.h | 16 ++--- .../Plugins/PMP/Distance_plugin.cpp | 2 +- .../doc/STL_Extension/CGAL/algorithm.h | 67 +----------------- .../doc/STL_Extension/PackageDescription.txt | 6 +- STL_Extension/include/CGAL/algorithm.h | 70 ------------------- .../test/STL_Extension/test_namespaces.cpp | 6 +- .../test/STL_Extension/test_stl_extension.cpp | 4 +- .../Building_kd_tree_with_ddim_points.cpp | 2 +- ...Orthogonal_incremental_neighbor_search.cpp | 4 +- .../test/Spatial_searching/Splitters.cpp | 2 +- .../include/CGAL/IO/Dxf_writer.h | 2 +- .../Straight_skeleton_builder_2_impl.h | 2 +- .../include/CGAL/compute_outer_frame_margin.h | 6 +- .../all_roi_assign_example.cpp | 6 +- .../all_roi_assign_example_Surface_mesh.cpp | 6 +- ...l_roi_assign_example_custom_polyhedron.cpp | 6 +- .../all_roi_assign_example_with_OpenMesh.cpp | 6 +- ...ring_roi_translate_rotate_Surface_mesh.cpp | 6 +- .../k_ring_roi_translate_rotate_example.cpp | 6 +- .../Detail/Edge_collapse_impl.h | 6 +- .../benchmark/Triangulation/delaunay.cpp | 2 +- .../examples/Triangulation/convex_hull.cpp | 2 +- .../examples/Triangulation/triangulation.cpp | 2 +- .../test/Triangulation/test_delaunay.cpp | 2 +- .../test/Triangulation/test_triangulation.cpp | 2 +- .../CDT_with_intersection_2.cpp | 2 +- .../Triangulation_2/copy_triangulation_2.cpp | 2 +- .../examples/Triangulation_2/hierarchy.cpp | 2 +- .../CGAL/_test_cls_delaunay_hierarchy_2.h | 2 +- .../benchmark/Triangulation_3/simple_2.cpp | 2 +- .../demo/Triangulation_3/Scene.cpp | 2 +- .../demo/Triangulation_3/Viewer.cpp | 2 +- .../Triangulation_3/copy_triangulation_3.cpp | 2 +- .../Triangulation_3/draw_triangulation_3.cpp | 2 +- 117 files changed, 229 insertions(+), 360 deletions(-) diff --git a/AABB_tree/test/AABB_tree/aabb_any_all_benchmark.cpp b/AABB_tree/test/AABB_tree/aabb_any_all_benchmark.cpp index d71c4258fbf..fbd3d215a96 100644 --- a/AABB_tree/test/AABB_tree/aabb_any_all_benchmark.cpp +++ b/AABB_tree/test/AABB_tree/aabb_any_all_benchmark.cpp @@ -78,7 +78,7 @@ boost::tuple test(const char* name) std::vector points; points.reserve(elements * 2); - CGAL::cpp11::copy_n(g, elements * 2, std::back_inserter(points)); + std::copy_n(g, elements * 2, std::back_inserter(points)); // generate a bunch of happy random primitives std::vector lines; diff --git a/AABB_tree/test/AABB_tree/aabb_test_ray_intersection.cpp b/AABB_tree/test/AABB_tree/aabb_test_ray_intersection.cpp index 549f925fb9e..06adc76dae7 100644 --- a/AABB_tree/test/AABB_tree/aabb_test_ray_intersection.cpp +++ b/AABB_tree/test/AABB_tree/aabb_test_ray_intersection.cpp @@ -109,8 +109,8 @@ int main() const double r = max_extent / 2; // Generate NB_RAYS*2 points that lie on a sphere of radius r, centered around bbox_center CGAL::Random rand = CGAL::Random(23); // fix the seed to yield the same results each run - CGAL::cpp11::copy_n(CGAL::Random_points_on_sphere_3(r, rand), NB_RAYS, std::back_inserter(v1)); - CGAL::cpp11::copy_n(CGAL::Random_points_on_sphere_3(r, rand), NB_RAYS, std::back_inserter(v2)); + std::copy_n(CGAL::Random_points_on_sphere_3(r, rand), NB_RAYS, std::back_inserter(v1)); + std::copy_n(CGAL::Random_points_on_sphere_3(r, rand), NB_RAYS, std::back_inserter(v2)); for(std::vector::iterator it = v1.begin(); it != v1.end(); ++it) { *it = *it + bbox_center; diff --git a/Algebraic_kernel_d/include/CGAL/Algebraic_kernel_d/Interval_evaluate_1.h b/Algebraic_kernel_d/include/CGAL/Algebraic_kernel_d/Interval_evaluate_1.h index a3438c72dc7..5dcd1a52b00 100644 --- a/Algebraic_kernel_d/include/CGAL/Algebraic_kernel_d/Interval_evaluate_1.h +++ b/Algebraic_kernel_d/include/CGAL/Algebraic_kernel_d/Interval_evaluate_1.h @@ -79,7 +79,7 @@ struct Interval_evaluate_1 : public CGAL::cpp98::binary_function Coefficient_const_iterator_range range = typename PT_1::Construct_coefficient_const_iterator_range()(p); - Coefficient_const_iterator it = CGAL::cpp11::prev(range.second); + Coefficient_const_iterator it = std::prev(range.second); Coercion_interval res(cast(*it)); diff --git a/Algebraic_kernel_d/include/CGAL/Algebraic_kernel_d/Interval_evaluate_2.h b/Algebraic_kernel_d/include/CGAL/Algebraic_kernel_d/Interval_evaluate_2.h index 0078b698e58..58ad72378f1 100644 --- a/Algebraic_kernel_d/include/CGAL/Algebraic_kernel_d/Interval_evaluate_2.h +++ b/Algebraic_kernel_d/include/CGAL/Algebraic_kernel_d/Interval_evaluate_2.h @@ -87,7 +87,7 @@ public: Coefficient_const_iterator_range range = typename PT_2::Construct_coefficient_const_iterator_range()(p); - Coefficient_const_iterator it = CGAL::cpp11::prev(range.second); + Coefficient_const_iterator it = std::prev(range.second); Interval_result_type initial_pair = interval_evaluate_1(*it,x_pair); Coercion_interval res(initial_pair.first,initial_pair.second); diff --git a/Alpha_shapes_2/examples/Alpha_shapes_2/ex_alpha_projection_traits.cpp b/Alpha_shapes_2/examples/Alpha_shapes_2/ex_alpha_projection_traits.cpp index a9b28fb2f06..4e7586384f7 100644 --- a/Alpha_shapes_2/examples/Alpha_shapes_2/ex_alpha_projection_traits.cpp +++ b/Alpha_shapes_2/examples/Alpha_shapes_2/ex_alpha_projection_traits.cpp @@ -107,7 +107,7 @@ bool file_input(OutputIterator out) int n; is >> n; std::cout << "Reading " << n << " points from file" << std::endl; - CGAL::cpp11::copy_n(std::istream_iterator(is), n, out); + std::copy_n(std::istream_iterator(is), n, out); return true; } diff --git a/Alpha_shapes_2/examples/Alpha_shapes_2/ex_alpha_shapes_2.cpp b/Alpha_shapes_2/examples/Alpha_shapes_2/ex_alpha_shapes_2.cpp index 505c2bcac4e..8057bb88226 100644 --- a/Alpha_shapes_2/examples/Alpha_shapes_2/ex_alpha_shapes_2.cpp +++ b/Alpha_shapes_2/examples/Alpha_shapes_2/ex_alpha_shapes_2.cpp @@ -50,7 +50,7 @@ bool file_input(OutputIterator out) int n; is >> n; std::cout << "Reading " << n << " points from file" << std::endl; - CGAL::cpp11::copy_n(std::istream_iterator(is), n, out); + std::copy_n(std::istream_iterator(is), n, out); return true; } diff --git a/Alpha_shapes_2/examples/Alpha_shapes_2/ex_periodic_alpha_shapes_2.cpp b/Alpha_shapes_2/examples/Alpha_shapes_2/ex_periodic_alpha_shapes_2.cpp index 7cb9a1243e0..71ae7483b6a 100644 --- a/Alpha_shapes_2/examples/Alpha_shapes_2/ex_periodic_alpha_shapes_2.cpp +++ b/Alpha_shapes_2/examples/Alpha_shapes_2/ex_periodic_alpha_shapes_2.cpp @@ -52,7 +52,7 @@ bool file_input(OutputIterator out) int n; is >> n; std::cout << "Reading " << n << " points from file" << std::endl; - CGAL::cpp11::copy_n(std::istream_iterator(is), n, out); + std::copy_n(std::istream_iterator(is), n, out); return true; } diff --git a/Alpha_shapes_2/test/Alpha_shapes_2/test_alpha.cpp b/Alpha_shapes_2/test/Alpha_shapes_2/test_alpha.cpp index 60d900af146..9d8aad735ac 100644 --- a/Alpha_shapes_2/test/Alpha_shapes_2/test_alpha.cpp +++ b/Alpha_shapes_2/test/Alpha_shapes_2/test_alpha.cpp @@ -97,7 +97,7 @@ file_input(OutputIterator out) int n; is >> n; std::cout << "Reading " << n << " points from file" << std::endl; - CGAL::cpp11::copy_n(std::istream_iterator(is), n, out); + std::copy_n(std::istream_iterator(is), n, out); return true; } diff --git a/BGL/test/BGL/test_Euler_operations.cpp b/BGL/test/BGL/test_Euler_operations.cpp index 2c745b82856..7b5439470a8 100644 --- a/BGL/test/BGL/test_Euler_operations.cpp +++ b/BGL/test/BGL/test_Euler_operations.cpp @@ -394,8 +394,8 @@ test_swap_edges() { Graph g; CGAL::make_tetrahedron(pt,pt,pt,pt,g); - halfedge_descriptor h1 = *CGAL::cpp11::next(boost::begin(halfedges(g)), i); - halfedge_descriptor h2 = *CGAL::cpp11::next(boost::begin(halfedges(g)), j); + halfedge_descriptor h1 = *std::next(boost::begin(halfedges(g)), i); + halfedge_descriptor h2 = *std::next(boost::begin(halfedges(g)), j); CGAL::internal::swap_edges(h1, h2, g); CGAL_assertion(CGAL::is_valid_polygon_mesh(g)); } diff --git a/Barycentric_coordinates_2/examples/Barycentric_coordinates_2/Wachspress_coordinates_example.cpp b/Barycentric_coordinates_2/examples/Barycentric_coordinates_2/Wachspress_coordinates_example.cpp index bb02864713c..8c322404836 100644 --- a/Barycentric_coordinates_2/examples/Barycentric_coordinates_2/Wachspress_coordinates_example.cpp +++ b/Barycentric_coordinates_2/examples/Barycentric_coordinates_2/Wachspress_coordinates_example.cpp @@ -30,7 +30,7 @@ int main() // Generate a set of random points. CGAL::Random_points_in_square_2 point_generator(1.0); - CGAL::cpp11::copy_n(point_generator, number_of_points, std::back_inserter(points)); + std::copy_n(point_generator, number_of_points, std::back_inserter(points)); // Find the convex hull of the generated set of points. // This convex hull gives the vertices of a convex polygon that contains all the generated points. diff --git a/Boolean_set_operations_2/archive/demo/Boolean_set_operations_2_GraphicsView/boolean_operations_2.cpp b/Boolean_set_operations_2/archive/demo/Boolean_set_operations_2_GraphicsView/boolean_operations_2.cpp index 81dfcdb9cad..90b4fcaec9c 100644 --- a/Boolean_set_operations_2/archive/demo/Boolean_set_operations_2_GraphicsView/boolean_operations_2.cpp +++ b/Boolean_set_operations_2/archive/demo/Boolean_set_operations_2_GraphicsView/boolean_operations_2.cpp @@ -946,7 +946,7 @@ bool read_bezier ( QString aFileName, Bezier_polygon_set& rSet, Bezier_region_so if ( bezier_polygons.size() > 1 ) { - for ( Bezier_polygon_vector::const_iterator it = CGAL::cpp11::next(bezier_polygons.begin()) + for ( Bezier_polygon_vector::const_iterator it = std::next(bezier_polygons.begin()) ; it != bezier_polygons.end() ; ++ it ) diff --git a/Boolean_set_operations_2/examples/Boolean_set_operations_2/bezier_traits_adapter2.cpp b/Boolean_set_operations_2/examples/Boolean_set_operations_2/bezier_traits_adapter2.cpp index 0b4db4c4505..2c5b160b40a 100644 --- a/Boolean_set_operations_2/examples/Boolean_set_operations_2/bezier_traits_adapter2.cpp +++ b/Boolean_set_operations_2/examples/Boolean_set_operations_2/bezier_traits_adapter2.cpp @@ -147,7 +147,7 @@ bool read_bezier(char const* aFileName, Bezier_polygon_set& rSet) if (polygons.size() > 1) { Bezier_polygon_vector::const_iterator it; - for (it = CGAL::cpp11::next(polygons.begin()); + for (it = std::next(polygons.begin()); it != polygons.end(); ++it) pwh.add_hole(*it); } diff --git a/Bounding_volumes/examples/Rectangular_p_center_2/rectangular_p_center_2.cpp b/Bounding_volumes/examples/Rectangular_p_center_2/rectangular_p_center_2.cpp index ed47f2667eb..920df52e0e3 100644 --- a/Bounding_volumes/examples/Rectangular_p_center_2/rectangular_p_center_2.cpp +++ b/Bounding_volumes/examples/Rectangular_p_center_2/rectangular_p_center_2.cpp @@ -24,7 +24,7 @@ int main() CGAL::set_pretty_mode(std::cout); Cont points; - CGAL::cpp11::copy_n(Generator(1), n, std::back_inserter(points)); + std::copy_n(Generator(1), n, std::back_inserter(points)); std::cout << "Generated Point Set:\n"; std::copy(points.begin(), points.end(), cout_ip); diff --git a/Bounding_volumes/test/Bounding_volumes/rectangular_p_center_2_random1_test.cpp b/Bounding_volumes/test/Bounding_volumes/rectangular_p_center_2_random1_test.cpp index 2a15e64980d..abf4badaf6d 100644 --- a/Bounding_volumes/test/Bounding_volumes/rectangular_p_center_2_random1_test.cpp +++ b/Bounding_volumes/test/Bounding_volumes/rectangular_p_center_2_random1_test.cpp @@ -175,7 +175,7 @@ main(int argc, char* argv[]) cerr << "random seed is " << random_seed << endl; #endif // CGAL_PCENTER_NO_OUTPUT PCont input_points; - CGAL::cpp11::copy_n(Point_generator(1, rnd), + std::copy_n(Point_generator(1, rnd), number_of_points, back_inserter(input_points)); diff --git a/Bounding_volumes/test/Bounding_volumes/rectangular_p_center_2_random2_test.cpp b/Bounding_volumes/test/Bounding_volumes/rectangular_p_center_2_random2_test.cpp index 48cad5746ca..d3c904127bb 100644 --- a/Bounding_volumes/test/Bounding_volumes/rectangular_p_center_2_random2_test.cpp +++ b/Bounding_volumes/test/Bounding_volumes/rectangular_p_center_2_random2_test.cpp @@ -198,7 +198,7 @@ main(int argc, char* argv[]) // generate a random cluster of size number_of_points: PCont input_points; - CGAL::cpp11::copy_n(ptgen, + std::copy_n(ptgen, number_of_points, back_inserter(input_points)); diff --git a/CGAL_ipelets/demo/CGAL_ipelets/generator.cpp b/CGAL_ipelets/demo/CGAL_ipelets/generator.cpp index bbf68c51e83..3d01d110567 100644 --- a/CGAL_ipelets/demo/CGAL_ipelets/generator.cpp +++ b/CGAL_ipelets/demo/CGAL_ipelets/generator.cpp @@ -128,7 +128,7 @@ void generator::protected_run(int fn) switch(fn){ case 0:{//random point in a circle CGAL::Random_points_in_disc_2 gs( size); - CGAL::cpp11::copy_n( gs, nbelements, std::back_inserter(points)); + std::copy_n( gs, nbelements, std::back_inserter(points)); } break; @@ -139,7 +139,7 @@ void generator::protected_run(int fn) case 6: case 2://points in a square : side = {CGAL::Random_points_in_square_2 gc (size); - CGAL::cpp11::copy_n( gc, nbelements, std::back_inserter(points)); + std::copy_n( gc, nbelements, std::back_inserter(points)); } break; @@ -166,7 +166,7 @@ void generator::protected_run(int fn) typedef CGAL::Creator_uniform_2< Point_2, Segment_2> Seg_creator; typedef CGAL::Join_input_iterator_2< P1, P2, Seg_creator> Seg_iterator; Seg_iterator g( p1, p2); - CGAL::cpp11::copy_n( g, nbelements, std::back_inserter(segments) ); + std::copy_n( g, nbelements, std::back_inserter(segments) ); break; }; diff --git a/Convex_hull_2/benchmark/Convex_hull_2/static_ch2.cpp b/Convex_hull_2/benchmark/Convex_hull_2/static_ch2.cpp index c6f6762f97f..3f548d6ca60 100644 --- a/Convex_hull_2/benchmark/Convex_hull_2/static_ch2.cpp +++ b/Convex_hull_2/benchmark/Convex_hull_2/static_ch2.cpp @@ -48,7 +48,7 @@ int main(int argc, char** argv) CGAL::Random r(seed); CGAL::Random_points_in_disc_2 g( 150.0,r); - CGAL::cpp11::copy_n( g, nbpts, std::back_inserter(points)); + std::copy_n( g, nbpts, std::back_inserter(points)); //the following code is for testing when there is only two extreme points, affine hull is 2D /* diff --git a/Convex_hull_2/include/CGAL/Convex_hull_2/ch_akl_toussaint_impl.h b/Convex_hull_2/include/CGAL/Convex_hull_2/ch_akl_toussaint_impl.h index 4e692654633..b63e2cd8bb9 100644 --- a/Convex_hull_2/include/CGAL/Convex_hull_2/ch_akl_toussaint_impl.h +++ b/Convex_hull_2/include/CGAL/Convex_hull_2/ch_akl_toussaint_impl.h @@ -276,22 +276,22 @@ ch_akl_toussaint(ForwardIterator first, ForwardIterator last, internal::ch_akl_toussaint_assign_points_to_regions_deg(first,cpp11::get<0>(ranges),left_turn,e,w,n,s,region1,region2,region3,region4,duplicated_exteme_points,ch_traits); if ( cpp11::get<0>(ranges)!=cpp11::get<1>(ranges) ) - internal::ch_akl_toussaint_assign_points_to_regions_deg(cpp11::next(cpp11::get<0>(ranges)),cpp11::get<1>(ranges),left_turn,e,w,n,s,region1,region2,region3,region4,duplicated_exteme_points,ch_traits); + internal::ch_akl_toussaint_assign_points_to_regions_deg(std::next(cpp11::get<0>(ranges)),cpp11::get<1>(ranges),left_turn,e,w,n,s,region1,region2,region3,region4,duplicated_exteme_points,ch_traits); if ( cpp11::get<1>(ranges)!=cpp11::get<2>(ranges) ) - internal::ch_akl_toussaint_assign_points_to_regions_deg(cpp11::next(cpp11::get<1>(ranges)),cpp11::get<2>(ranges),left_turn,e,w,n,s,region1,region2,region3,region4,duplicated_exteme_points,ch_traits); + internal::ch_akl_toussaint_assign_points_to_regions_deg(std::next(cpp11::get<1>(ranges)),cpp11::get<2>(ranges),left_turn,e,w,n,s,region1,region2,region3,region4,duplicated_exteme_points,ch_traits); if ( cpp11::get<2>(ranges)!=cpp11::get<3>(ranges) ) - internal::ch_akl_toussaint_assign_points_to_regions_deg(cpp11::next(cpp11::get<2>(ranges)),cpp11::get<3>(ranges),left_turn,e,w,n,s,region1,region2,region3,region4,duplicated_exteme_points,ch_traits); + internal::ch_akl_toussaint_assign_points_to_regions_deg(std::next(cpp11::get<2>(ranges)),cpp11::get<3>(ranges),left_turn,e,w,n,s,region1,region2,region3,region4,duplicated_exteme_points,ch_traits); - internal::ch_akl_toussaint_assign_points_to_regions_deg(cpp11::next(cpp11::get<3>(ranges)),last,left_turn,e,w,n,s,region1,region2,region3,region4,duplicated_exteme_points,ch_traits); + internal::ch_akl_toussaint_assign_points_to_regions_deg(std::next(cpp11::get<3>(ranges)),last,left_turn,e,w,n,s,region1,region2,region3,region4,duplicated_exteme_points,ch_traits); } else{ internal::ch_akl_toussaint_assign_points_to_regions(first,cpp11::get<0>(ranges),left_turn,e,w,n,s,region1,region2,region3,region4,ch_traits); - internal::ch_akl_toussaint_assign_points_to_regions(cpp11::next(cpp11::get<0>(ranges)),cpp11::get<1>(ranges),left_turn,e,w,n,s,region1,region2,region3,region4,ch_traits); - internal::ch_akl_toussaint_assign_points_to_regions(cpp11::next(cpp11::get<1>(ranges)),cpp11::get<2>(ranges),left_turn,e,w,n,s,region1,region2,region3,region4,ch_traits); - internal::ch_akl_toussaint_assign_points_to_regions(cpp11::next(cpp11::get<2>(ranges)),cpp11::get<3>(ranges),left_turn,e,w,n,s,region1,region2,region3,region4,ch_traits); - internal::ch_akl_toussaint_assign_points_to_regions(cpp11::next(cpp11::get<3>(ranges)),last,left_turn,e,w,n,s,region1,region2,region3,region4,ch_traits); + internal::ch_akl_toussaint_assign_points_to_regions(std::next(cpp11::get<0>(ranges)),cpp11::get<1>(ranges),left_turn,e,w,n,s,region1,region2,region3,region4,ch_traits); + internal::ch_akl_toussaint_assign_points_to_regions(std::next(cpp11::get<1>(ranges)),cpp11::get<2>(ranges),left_turn,e,w,n,s,region1,region2,region3,region4,ch_traits); + internal::ch_akl_toussaint_assign_points_to_regions(std::next(cpp11::get<2>(ranges)),cpp11::get<3>(ranges),left_turn,e,w,n,s,region1,region2,region3,region4,ch_traits); + internal::ch_akl_toussaint_assign_points_to_regions(std::next(cpp11::get<3>(ranges)),last,left_turn,e,w,n,s,region1,region2,region3,region4,ch_traits); } #if defined(CGAL_CH_NO_POSTCONDITIONS) || defined(CGAL_NO_POSTCONDITIONS) \ @@ -300,13 +300,13 @@ ch_akl_toussaint(ForwardIterator first, ForwardIterator last, #else Tee_for_output_iterator res(result); #endif // no postconditions ... - std::sort( cpp11::next(region1.begin() ), region1.end(), + std::sort( std::next(region1.begin() ), region1.end(), ch_traits.less_xy_2_object() ); - std::sort( cpp11::next(region2.begin() ), region2.end(), + std::sort( std::next(region2.begin() ), region2.end(), ch_traits.less_xy_2_object() ); - std::sort( cpp11::next(region3.begin() ), region3.end(), + std::sort( std::next(region3.begin() ), region3.end(), boost::bind(ch_traits.less_xy_2_object(), _2, _1) ); - std::sort( cpp11::next(region4.begin() ), region4.end(), + std::sort( std::next(region4.begin() ), region4.end(), boost::bind(ch_traits.less_xy_2_object(), _2, _1) ); if (! equal_points(*w,*s) ) diff --git a/Convex_hull_2/include/CGAL/Convex_hull_2/ch_bykat_impl.h b/Convex_hull_2/include/CGAL/Convex_hull_2/ch_bykat_impl.h index 43e91b9fb3a..bbceaebde4b 100644 --- a/Convex_hull_2/include/CGAL/Convex_hull_2/ch_bykat_impl.h +++ b/Convex_hull_2/include/CGAL/Convex_hull_2/ch_bykat_impl.h @@ -163,8 +163,8 @@ ch_bykat_with_threshold(InputIterator first, InputIterator last, P.push_back(Point_2() ); std::copy(first,last,std::back_inserter(P)); P.push_back(Point_2() ); - Pbegin = cpp11::next(P.begin()); - Pend = cpp11::prev(P.end()); + Pbegin = std::next(P.begin()); + Pend = std::prev(P.end()); ch_we_point(Pbegin, Pend, l, r, ch_traits); Point_2 a = *l; Point_2 b = *r; @@ -205,15 +205,15 @@ ch_bykat_with_threshold(InputIterator first, InputIterator last, std::swap( b, *++r); if ( ch_traits.less_xy_2_object()(*l,*r) ) { - std::sort(cpp11::next(l), r, + std::sort(std::next(l), r, ch_traits.less_xy_2_object() ); } else { - std::sort(cpp11::next(l), r, + std::sort(std::next(l), r, boost::bind(ch_traits.less_xy_2_object(), _2, _1) ); } - ch__ref_graham_andrew_scan(l, cpp11::next(r), res, ch_traits); + ch__ref_graham_andrew_scan(l, std::next(r), res, ch_traits); std::swap( a, *l); std::swap( b, *r); if ( L.empty() ) break; diff --git a/Convex_hull_2/include/CGAL/Convex_hull_2/ch_eddy_impl.h b/Convex_hull_2/include/CGAL/Convex_hull_2/ch_eddy_impl.h index f813f91055b..922c5368900 100644 --- a/Convex_hull_2/include/CGAL/Convex_hull_2/ch_eddy_impl.h +++ b/Convex_hull_2/include/CGAL/Convex_hull_2/ch_eddy_impl.h @@ -58,7 +58,7 @@ ch__recursive_eddy(List& L, != b_it ); - ListIterator f_it = cpp11::next(a_it); + ListIterator f_it = std::next(a_it); Less_dist less_dist = ch_traits.less_signed_distance_to_line_2_object(); ListIterator c_it = std::min_element( f_it, b_it, // max before @@ -70,11 +70,11 @@ ch__recursive_eddy(List& L, c_it = L.insert(c_it, c); L.erase( f_it, b_it ); - if ( cpp11::next(a_it) != c_it ) + if ( std::next(a_it) != c_it ) { ch__recursive_eddy( L, a_it, c_it, ch_traits); } - if ( cpp11::next(c_it) != b_it ) + if ( std::next(c_it) != b_it ) { ch__recursive_eddy( L, c_it, b_it, ch_traits); } @@ -117,7 +117,7 @@ ch_eddy(InputIterator first, InputIterator last, L.push_front(wp); e = L.insert(e, ep); - if ( cpp11::next(L.begin()) != e ) + if ( std::next(L.begin()) != e ) { ch__recursive_eddy( L, L.begin(), e, ch_traits); } diff --git a/Convex_hull_2/include/CGAL/Convex_hull_2/ch_graham_andrew_impl.h b/Convex_hull_2/include/CGAL/Convex_hull_2/ch_graham_andrew_impl.h index 093cc3addf3..05f80992ecd 100644 --- a/Convex_hull_2/include/CGAL/Convex_hull_2/ch_graham_andrew_impl.h +++ b/Convex_hull_2/include/CGAL/Convex_hull_2/ch_graham_andrew_impl.h @@ -52,7 +52,7 @@ ch_graham_andrew_scan( BidirectionalIterator first, BidirectionalIterator beta; BidirectionalIterator iter; CGAL_ch_precondition( first != last ); - CGAL_ch_precondition( cpp11::next(first) != last ); + CGAL_ch_precondition( std::next(first) != last ); --last; CGAL_ch_precondition( *first != *last ); @@ -146,7 +146,7 @@ ch__ref_graham_andrew_scan( BidirectionalIterator first, BidirectionalIterator beta; BidirectionalIterator iter; CGAL_ch_precondition( first != last ); - CGAL_ch_precondition( cpp11::next(first) != last ); + CGAL_ch_precondition( std::next(first) != last ); --last; CGAL_ch_precondition(! equal_points(*first,*last) ); diff --git a/Convex_hull_2/include/CGAL/Convex_hull_2/convexity_check_2_impl.h b/Convex_hull_2/include/CGAL/Convex_hull_2/convexity_check_2_impl.h index 846ec3df2f4..125c7ab0f42 100644 --- a/Convex_hull_2/include/CGAL/Convex_hull_2/convexity_check_2_impl.h +++ b/Convex_hull_2/include/CGAL/Convex_hull_2/convexity_check_2_impl.h @@ -159,7 +159,7 @@ ch_brute_force_check_2(ForwardIterator1 first1, ForwardIterator1 last1, if ( first2 == last2) return false; - if ( cpp11::next(first2) == last2 ) + if ( std::next(first2) == last2 ) { while (first1 != last1) { @@ -204,7 +204,7 @@ ch_brute_force_chain_check_2(ForwardIterator1 first1, if ( first2 == last2) return false; - if ( cpp11::next(first2) == last2 ) return true; + if ( std::next(first2) == last2 ) return true; Left_turn_2 left_turn = ch_traits.left_turn_2_object(); iter22 = first2; diff --git a/Convex_hull_2/include/CGAL/segment_intersection_points_2.h b/Convex_hull_2/include/CGAL/segment_intersection_points_2.h index 5346059e350..0bcd180f7d4 100644 --- a/Convex_hull_2/include/CGAL/segment_intersection_points_2.h +++ b/Convex_hull_2/include/CGAL/segment_intersection_points_2.h @@ -66,7 +66,7 @@ si_brute_force_II(ForwardIterator first, ForwardIterator last, Orientation orientation = traits.orientation_2_object(); for ( ForwardIterator outer = first; outer != last; ++outer) - for ( ForwardIterator inner = cpp11::next(outer); inner != last; ++inner) + for ( ForwardIterator inner = std::next(outer); inner != last; ++inner) { Point s1 = (*outer).source(); Point e1 = (*outer).target(); diff --git a/Convex_hull_3/benchmark/Convex_hull_3/compare_different_approach.cpp b/Convex_hull_3/benchmark/Convex_hull_3/compare_different_approach.cpp index 4015bd0151a..6549c202905 100644 --- a/Convex_hull_3/benchmark/Convex_hull_3/compare_different_approach.cpp +++ b/Convex_hull_3/benchmark/Convex_hull_3/compare_different_approach.cpp @@ -43,7 +43,7 @@ int main(int argc,char** argv) if (argc==1){ CGAL::Random_points_in_sphere_3 gen(1.0); int nbpt=1000000; - CGAL::cpp11::copy_n( gen, nbpt, std::back_inserter(points) ); + std::copy_n( gen, nbpt, std::back_inserter(points) ); std::cout << "Using " << 1000000 << " random points in the unit ball\n"; } else{ diff --git a/Convex_hull_3/benchmark/Convex_hull_3/is_on_positive_side.cpp b/Convex_hull_3/benchmark/Convex_hull_3/is_on_positive_side.cpp index 4848a9ce211..a47890897b7 100644 --- a/Convex_hull_3/benchmark/Convex_hull_3/is_on_positive_side.cpp +++ b/Convex_hull_3/benchmark/Convex_hull_3/is_on_positive_side.cpp @@ -157,7 +157,7 @@ int main() points.reserve(nb_pts); K::Point_3 p=*gen++,q=*gen++,r=*gen++; - CGAL::cpp11::copy_n(gen,nb_pts,std::back_inserter(points)); + std::copy_n(gen,nb_pts,std::back_inserter(points)); std::vector res0; res0.reserve(nb_pts); std::vector res1; res1.reserve(nb_pts); diff --git a/Convex_hull_3/demo/Convex_hull_3/quickhull_3_demo.cpp b/Convex_hull_3/demo/Convex_hull_3/quickhull_3_demo.cpp index d50f0faef09..dbea2a29a87 100644 --- a/Convex_hull_3/demo/Convex_hull_3/quickhull_3_demo.cpp +++ b/Convex_hull_3/demo/Convex_hull_3/quickhull_3_demo.cpp @@ -117,7 +117,7 @@ int main(int argc, char* argv[]) Generator gen(100.0); // generate num points and copy them to a vector - CGAL::cpp11::copy_n( gen, num, std::back_inserter(points) ); + std::copy_n( gen, num, std::back_inserter(points) ); // define object to hold convex hull CGAL::Object ch_object; diff --git a/Convex_hull_3/examples/Convex_hull_3/dynamic_hull_3.cpp b/Convex_hull_3/examples/Convex_hull_3/dynamic_hull_3.cpp index 8d80ab79138..518beeb6b1e 100644 --- a/Convex_hull_3/examples/Convex_hull_3/dynamic_hull_3.cpp +++ b/Convex_hull_3/examples/Convex_hull_3/dynamic_hull_3.cpp @@ -20,7 +20,7 @@ int main() // generate 250 points randomly in a sphere of radius 100.0 // and insert them into the triangulation - CGAL::cpp11::copy_n(gen, 250, std::back_inserter(points) ); + std::copy_n(gen, 250, std::back_inserter(points) ); Delaunay T; T.insert(points.begin(), points.end()); diff --git a/Convex_hull_3/examples/Convex_hull_3/dynamic_hull_LCC_3.cpp b/Convex_hull_3/examples/Convex_hull_3/dynamic_hull_LCC_3.cpp index d83729c0b69..40122c2c042 100644 --- a/Convex_hull_3/examples/Convex_hull_3/dynamic_hull_LCC_3.cpp +++ b/Convex_hull_3/examples/Convex_hull_3/dynamic_hull_LCC_3.cpp @@ -22,7 +22,7 @@ int main() // generate 250 points randomly in a sphere of radius 100.0 // and insert them into the triangulation - CGAL::cpp11::copy_n(gen, 250, std::back_inserter(points) ); + std::copy_n(gen, 250, std::back_inserter(points) ); Delaunay T; T.insert(points.begin(), points.end()); diff --git a/Convex_hull_3/examples/Convex_hull_3/dynamic_hull_OM_3.cpp b/Convex_hull_3/examples/Convex_hull_3/dynamic_hull_OM_3.cpp index 5eb33c64961..ac0d5ecd63e 100644 --- a/Convex_hull_3/examples/Convex_hull_3/dynamic_hull_OM_3.cpp +++ b/Convex_hull_3/examples/Convex_hull_3/dynamic_hull_OM_3.cpp @@ -26,7 +26,7 @@ int main() // generate 250 points randomly in a sphere of radius 100.0 // and insert them into the triangulation - CGAL::cpp11::copy_n(gen, 250, std::back_inserter(points) ); + std::copy_n(gen, 250, std::back_inserter(points) ); Delaunay T; T.insert(points.begin(), points.end()); diff --git a/Convex_hull_3/examples/Convex_hull_3/dynamic_hull_SM_3.cpp b/Convex_hull_3/examples/Convex_hull_3/dynamic_hull_SM_3.cpp index a8a8e82eb31..7e9d5106fa2 100644 --- a/Convex_hull_3/examples/Convex_hull_3/dynamic_hull_SM_3.cpp +++ b/Convex_hull_3/examples/Convex_hull_3/dynamic_hull_SM_3.cpp @@ -21,7 +21,7 @@ int main() // generate 250 points randomly in a sphere of radius 100.0 // and insert them into the triangulation - CGAL::cpp11::copy_n(gen, 250, std::back_inserter(points) ); + std::copy_n(gen, 250, std::back_inserter(points) ); Delaunay T; T.insert(points.begin(), points.end()); diff --git a/Convex_hull_3/include/CGAL/Convex_hull_3/dual/halfspace_intersection_3.h b/Convex_hull_3/include/CGAL/Convex_hull_3/dual/halfspace_intersection_3.h index 6a84a7385a3..d1bcf055c62 100644 --- a/Convex_hull_3/include/CGAL/Convex_hull_3/dual/halfspace_intersection_3.h +++ b/Convex_hull_3/include/CGAL/Convex_hull_3/dual/halfspace_intersection_3.h @@ -209,7 +209,7 @@ namespace CGAL // Look for two non-parallel planes PlaneIterator plane1_it = planes.begin(); - PlaneIterator plane2_it = cpp11::next(planes.begin()); + PlaneIterator plane2_it = std::next(planes.begin()); while (plane2_it != planes.end() && collinear_plane(*plane1_it, *plane2_it)) { @@ -218,7 +218,7 @@ namespace CGAL if (plane2_it == planes.end()) return false; - PlaneIterator plane3_it = cpp11::next(plane2_it); + PlaneIterator plane3_it = std::next(plane2_it); // Look for a triple of planes intersecting in a point while (plane3_it != planes.end() && diff --git a/Convex_hull_3/test/Convex_hull_3/quickhull_degenerate_test_3.cpp b/Convex_hull_3/test/Convex_hull_3/quickhull_degenerate_test_3.cpp index 2f51b0ac7f3..88654465074 100644 --- a/Convex_hull_3/test/Convex_hull_3/quickhull_degenerate_test_3.cpp +++ b/Convex_hull_3/test/Convex_hull_3/quickhull_degenerate_test_3.cpp @@ -132,7 +132,7 @@ void test_collinear() // generate 100 points on the segment with endpoints (0,0) and (1,0) CGAL::Random_points_on_segment_2 g(Point_2(0,0), Point_2(1,0)); - CGAL::cpp11::copy_n(g, 100, std::back_inserter(point_2_list)); + std::copy_n(g, 100, std::back_inserter(point_2_list)); std::list::iterator point_it = point_2_list.begin(); point_3_list.push_back(Point_3(0,0,0)); diff --git a/Convex_hull_3/test/Convex_hull_3/quickhull_test_3.cpp b/Convex_hull_3/test/Convex_hull_3/quickhull_test_3.cpp index 5911cc5c837..5a49ca60266 100644 --- a/Convex_hull_3/test/Convex_hull_3/quickhull_test_3.cpp +++ b/Convex_hull_3/test/Convex_hull_3/quickhull_test_3.cpp @@ -138,7 +138,7 @@ int main() std::cerr << "Testing 500 random points" << std::endl; std::vector points; Generator g(500); - CGAL::cpp11::copy_n( g, num, std::back_inserter(points)); + std::copy_n( g, num, std::back_inserter(points)); assert(points.size() == num); diff --git a/Filtered_kernel/benchmark/Filtered_kernel/orientation_3.cpp b/Filtered_kernel/benchmark/Filtered_kernel/orientation_3.cpp index cad1122d51d..cd497e0dcbf 100644 --- a/Filtered_kernel/benchmark/Filtered_kernel/orientation_3.cpp +++ b/Filtered_kernel/benchmark/Filtered_kernel/orientation_3.cpp @@ -31,7 +31,7 @@ int main() std::vector points; points.reserve(N); CGAL::Random_points_in_sphere_3 g( 100.0); - CGAL::cpp11::copy_n( g, N, std::back_inserter(points)); + std::copy_n( g, N, std::back_inserter(points)); timer.stop(); std::cout << "Fill vector: " << timer.time() << " sec" << std::endl; timer.reset(); diff --git a/Generator/doc/Generator/CGAL/point_generators_2.h b/Generator/doc/Generator/CGAL/point_generators_2.h index 4db77fafc06..654099e0c08 100644 --- a/Generator/doc/Generator/CGAL/point_generators_2.h +++ b/Generator/doc/Generator/CGAL/point_generators_2.h @@ -146,7 +146,7 @@ distributed in an open disc. The default `Creator` is \cgalModels `InputIterator` \cgalModels `PointGenerator` -\sa `CGAL::cpp11::copy_n()` +\sa `std::copy_n()` \sa `CGAL::Counting_iterator` \sa `CGAL::Points_on_segment_2` \sa `CGAL::Random_points_in_square_2` @@ -214,7 +214,7 @@ distributed in a half-open square. The default `Creator` is \cgalModels `InputIterator` \cgalModels `PointGenerator` -\sa `CGAL::cpp11::copy_n()` +\sa `std::copy_n()` \sa `CGAL::Counting_iterator` \sa `CGAL::Points_on_segment_2` \sa `CGAL::Random_points_in_triangle_2` @@ -283,7 +283,7 @@ distributed inside a triangle. The default `Creator` is \cgalModels `InputIterator` \cgalModels `PointGenerator` -\sa `CGAL::cpp11::copy_n()` +\sa `std::copy_n()` \sa `CGAL::Counting_iterator` \sa `CGAL::Points_on_segment_2` \sa `CGAL::Random_points_in_disc_2` @@ -360,7 +360,7 @@ typedef const Point_2& reference; \cgalModels `InputIterator` \cgalModels `PointGenerator` - \sa `CGAL::cpp11::copy_n()` + \sa `std::copy_n()` \sa `CGAL::Counting_iterator` \sa `CGAL::Points_on_segment_2` \sa `CGAL::Random_points_in_disc_2` @@ -432,7 +432,7 @@ get_default_random() ); \cgalModels `InputIterator` \cgalModels `PointGenerator` - \sa `CGAL::cpp11::copy_n()` + \sa `std::copy_n()` \sa `CGAL::Counting_iterator` \sa `CGAL::Points_on_segment_2` \sa `CGAL::Random_points_in_disc_2` @@ -506,7 +506,7 @@ rounding errors. \cgalModels `InputIterator` \cgalModels `PointGenerator` -\sa `CGAL::cpp11::copy_n()` +\sa `std::copy_n()` \sa `CGAL::Counting_iterator` \sa `CGAL::Points_on_segment_2` \sa `CGAL::Random_points_in_disc_2` @@ -577,7 +577,7 @@ distributed on a segment. The default `Creator` is \cgalModels `InputIterator` \cgalModels `PointGenerator` -\sa `CGAL::cpp11::copy_n()` +\sa `std::copy_n()` \sa `CGAL::Counting_iterator` \sa `CGAL::Points_on_segment_2` \sa `CGAL::Random_points_in_disc_2` @@ -647,7 +647,7 @@ distributed on the boundary of a square. The default `Creator` is \cgalModels `InputIterator` \cgalModels `PointGenerator` -\sa `CGAL::cpp11::copy_n()` +\sa `std::copy_n()` \sa `CGAL::Counting_iterator` \sa `CGAL::Points_on_segment_2` \sa `CGAL::Random_points_in_disc_2` @@ -717,7 +717,7 @@ endpoints are specified upon construction. The points are equally spaced. \cgalModels `PointGenerator` -\sa `CGAL::cpp11::copy_n()` +\sa `std::copy_n()` \sa `CGAL::Counting_iterator` \sa `CGAL::points_on_segment` \sa `CGAL::Random_points_in_disc_2` diff --git a/Generator/doc/Generator/CGAL/point_generators_3.h b/Generator/doc/Generator/CGAL/point_generators_3.h index cb87e09ed95..e8ea46c7060 100644 --- a/Generator/doc/Generator/CGAL/point_generators_3.h +++ b/Generator/doc/Generator/CGAL/point_generators_3.h @@ -44,7 +44,7 @@ distributed in a half-open cube. The default `Creator` is \cgalModels `InputIterator` \cgalModels `PointGenerator` -\sa `CGAL::cpp11::copy_n()` +\sa `std::copy_n()` \sa `CGAL::Counting_iterator` \sa `CGAL::Random_points_in_square_2` \sa `CGAL::Random_points_in_sphere_3` @@ -113,7 +113,7 @@ distributed strictly inside a sphere. The default `Creator` is \cgalModels `InputIterator` \cgalModels `PointGenerator` -\sa `CGAL::cpp11::copy_n()` +\sa `std::copy_n()` \sa `CGAL::Counting_iterator` \sa `CGAL::Random_points_in_disc_2` \sa `CGAL::Random_points_in_cube_3` @@ -182,7 +182,7 @@ distributed inside a 3D triangle. The default `Creator` is \cgalModels `InputIterator` \cgalModels `PointGenerator` -\sa `CGAL::cpp11::copy_n()` +\sa `std::copy_n()` \sa `CGAL::Counting_iterator` \sa `CGAL::Random_points_in_disc_2` \sa `CGAL::Random_points_in_cube_3` @@ -260,7 +260,7 @@ distributed on a segment. The default `Creator` is \cgalModels `InputIterator` \cgalModels `PointGenerator` -\sa `CGAL::cpp11::copy_n()` +\sa `std::copy_n()` \sa `CGAL::Counting_iterator` \sa `std::random_shuffle` @@ -326,7 +326,7 @@ distributed inside a tetrahedron. The default `Creator` is \cgalModels `InputIterator` \cgalModels `PointGenerator` -\sa `CGAL::cpp11::copy_n()` +\sa `std::copy_n()` \sa `CGAL::Counting_iterator` \sa `CGAL::Random_points_in_cube_3` \sa `CGAL::Random_points_in_triangle_3` @@ -405,7 +405,7 @@ The triangle range must be valid and unchanged while the iterator is used. \cgalModels `InputIterator` \cgalModels `PointGenerator` -\sa `CGAL::cpp11::copy_n()` +\sa `std::copy_n()` \sa `CGAL::Counting_iterator` \sa `CGAL::Random_points_in_cube_3` \sa `CGAL::Random_points_in_triangle_3` @@ -476,7 +476,7 @@ The triangle mesh must be valid and unchanged while the iterator is used. \cgalModels `InputIterator` \cgalModels `PointGenerator` -\sa `CGAL::cpp11::copy_n()` +\sa `std::copy_n()` \sa `CGAL::Counting_iterator` \sa `CGAL::Random_points_in_disc_2` \sa `CGAL::Random_points_in_cube_3` @@ -559,7 +559,7 @@ The tetrahedral mesh must be valid and unchanged while the iterator is used. \cgalModels `InputIterator` \cgalModels `PointGenerator` -\sa `CGAL::cpp11::copy_n()` +\sa `std::copy_n()` \sa `CGAL::Counting_iterator` \sa `CGAL::Random_points_in_disc_2` \sa `CGAL::Random_points_in_cube_3` @@ -637,7 +637,7 @@ The tetrahedral mesh must be valid and unchanged while the iterator is used. \cgalModels `InputIterator` \cgalModels `PointGenerator` -\sa `CGAL::cpp11::copy_n()` +\sa `std::copy_n()` \sa `CGAL::Counting_iterator` \sa `CGAL::Random_points_in_disc_2` \sa `CGAL::Random_points_in_cube_3` @@ -715,7 +715,7 @@ rounding errors. \cgalModels `InputIterator` \cgalModels `PointGenerator` -\sa `CGAL::cpp11::copy_n()` +\sa `std::copy_n()` \sa `CGAL::Counting_iterator` \sa `CGAL::Random_points_on_circle_2` \sa `CGAL::Random_points_in_cube_3` diff --git a/Generator/doc/Generator/CGAL/point_generators_d.h b/Generator/doc/Generator/CGAL/point_generators_d.h index b064051adac..7a1b71f8c44 100644 --- a/Generator/doc/Generator/CGAL/point_generators_d.h +++ b/Generator/doc/Generator/CGAL/point_generators_d.h @@ -43,7 +43,7 @@ distributed in an open ball in any dimension. \cgalModels `InputIterator` \cgalModels `PointGenerator` -\sa `CGAL::cpp11::copy_n()` +\sa `std::copy_n()` \sa `CGAL::Counting_iterator` \sa `CGAL::Random_points_in_disc_2` \sa `CGAL::Random_points_in_sphere_3` @@ -112,7 +112,7 @@ distributed in an half-open cube. \cgalModels `InputIterator` \cgalModels `PointGenerator` -\sa `CGAL::cpp11::copy_n()` +\sa `std::copy_n()` \sa `CGAL::Counting_iterator` \sa `CGAL::Random_points_in_square_2` \sa `CGAL::Random_points_in_cube_3` @@ -187,7 +187,7 @@ rounding errors. \cgalModels `InputIterator` \cgalModels `PointGenerator` -\sa `CGAL::cpp11::copy_n()` +\sa `std::copy_n()` \sa `CGAL::Counting_iterator` \sa `CGAL::Random_points_on_circle_2` \sa `CGAL::Random_points_on_sphere_3` diff --git a/Generator/examples/Generator/random_degenerate_point_set.cpp b/Generator/examples/Generator/random_degenerate_point_set.cpp index 1b3245e0fd0..b76629f0b19 100644 --- a/Generator/examples/Generator/random_degenerate_point_set.cpp +++ b/Generator/examples/Generator/random_degenerate_point_set.cpp @@ -20,7 +20,7 @@ int main() { // Create 600 points within a disc of radius 150. Random_points_in_disc_2 g( 150.0); - CGAL::cpp11::copy_n( g, 600, std::back_inserter(points)); + std::copy_n( g, 600, std::back_inserter(points)); // Create 200 points from a 15 x 15 grid. points_on_square_grid_2( 250.0, 200, std::back_inserter(points),Creator()); diff --git a/Generator/examples/Generator/random_grid.cpp b/Generator/examples/Generator/random_grid.cpp index 3c716232d27..b3ca49c311f 100644 --- a/Generator/examples/Generator/random_grid.cpp +++ b/Generator/examples/Generator/random_grid.cpp @@ -31,7 +31,7 @@ int main() { // Create 250 points within a disc of radius 150. Random_points_in_disc_2 g( 150.0); - CGAL::cpp11::copy_n( g, 250, std::back_inserter(points)); + std::copy_n( g, 250, std::back_inserter(points)); // Check that we have really created 500 points. assert( points.size() == 500); diff --git a/Generator/examples/Generator/random_points_in_tetrahedral_mesh_3.cpp b/Generator/examples/Generator/random_points_in_tetrahedral_mesh_3.cpp index 8fa3d6b924f..79a1ea4fd14 100644 --- a/Generator/examples/Generator/random_points_in_tetrahedral_mesh_3.cpp +++ b/Generator/examples/Generator/random_points_in_tetrahedral_mesh_3.cpp @@ -56,7 +56,7 @@ int main() // Create the generator, input is the C3t3 c3t3 Random_points_in_tetrahedral_mesh_3 g(c3t3); // Get 100 random points in cdt - CGAL::cpp11::copy_n( g, 100, std::back_inserter(points)); + std::copy_n( g, 100, std::back_inserter(points)); // Check that we have really created 100 points. assert( points.size() == 100); diff --git a/Generator/examples/Generator/random_points_in_triangles_2.cpp b/Generator/examples/Generator/random_points_in_triangles_2.cpp index 3332408ea08..de429d6b4c5 100644 --- a/Generator/examples/Generator/random_points_in_triangles_2.cpp +++ b/Generator/examples/Generator/random_points_in_triangles_2.cpp @@ -22,7 +22,7 @@ int main() // Create the generator, input is the vector of Triangle_2 Random_points_in_triangles_2 g(triangles); // Get 100 random points in cdt - CGAL::cpp11::copy_n(g, 1000, std::back_inserter(points)); + std::copy_n(g, 1000, std::back_inserter(points)); // Check that we have really created 100 points. assert( points.size() == 1000); diff --git a/Generator/examples/Generator/random_points_in_triangles_3.cpp b/Generator/examples/Generator/random_points_in_triangles_3.cpp index c23d7c39f34..f859d8bd9a1 100644 --- a/Generator/examples/Generator/random_points_in_triangles_3.cpp +++ b/Generator/examples/Generator/random_points_in_triangles_3.cpp @@ -22,7 +22,7 @@ int main() // Create the generator, input is the vector of Triangle_3 Random_points_in_triangles_3 g(triangles); // Get 100 random points in cdt - CGAL::cpp11::copy_n(g, 1000, std::back_inserter(points)); + std::copy_n(g, 1000, std::back_inserter(points)); // Check that we have really created 100 points. assert( points.size() == 1000); diff --git a/Generator/examples/Generator/random_points_on_tetrahedral_mesh_3.cpp b/Generator/examples/Generator/random_points_on_tetrahedral_mesh_3.cpp index 0b1c4693d0f..d564ee7c2f3 100644 --- a/Generator/examples/Generator/random_points_on_tetrahedral_mesh_3.cpp +++ b/Generator/examples/Generator/random_points_on_tetrahedral_mesh_3.cpp @@ -55,7 +55,7 @@ int main() // Create the generator, input is the C3t3 c3t3 Random_points_in_tetrahedral_mesh_boundary_3 g(c3t3); // Get 100 random points in cdt - CGAL::cpp11::copy_n( g, 100, std::back_inserter(points)); + std::copy_n( g, 100, std::back_inserter(points)); // Check that we have really created 100 points. assert( points.size() == 100); diff --git a/Generator/examples/Generator/random_points_on_triangle_mesh_2.cpp b/Generator/examples/Generator/random_points_on_triangle_mesh_2.cpp index 642c534f60a..5f25f7ba78d 100644 --- a/Generator/examples/Generator/random_points_on_triangle_mesh_2.cpp +++ b/Generator/examples/Generator/random_points_on_triangle_mesh_2.cpp @@ -50,7 +50,7 @@ int main() Random_points_in_triangle_mesh_2 g(cdt); // Get 100 random points in cdt - CGAL::cpp11::copy_n(g, 100, std::back_inserter(points)); + std::copy_n(g, 100, std::back_inserter(points)); // Check that we have really created 100 points. assert(points.size() == 100); diff --git a/Generator/examples/Generator/random_points_on_triangle_mesh_3.cpp b/Generator/examples/Generator/random_points_on_triangle_mesh_3.cpp index e850e585a9a..06b767123d4 100644 --- a/Generator/examples/Generator/random_points_on_triangle_mesh_3.cpp +++ b/Generator/examples/Generator/random_points_on_triangle_mesh_3.cpp @@ -24,7 +24,7 @@ int main() g(polyhedron); // Get 100 random points in cdt - CGAL::cpp11::copy_n(g, 100, std::back_inserter(points)); + std::copy_n(g, 100, std::back_inserter(points)); // Check that we have really created 100 points. assert( points.size() == 100); diff --git a/Generator/examples/Generator/random_points_tetrahedron_and_triangle_3.cpp b/Generator/examples/Generator/random_points_tetrahedron_and_triangle_3.cpp index 768d9925428..4af917762fb 100644 --- a/Generator/examples/Generator/random_points_tetrahedron_and_triangle_3.cpp +++ b/Generator/examples/Generator/random_points_tetrahedron_and_triangle_3.cpp @@ -29,10 +29,10 @@ int main() { Point_generator_ii g_ii(tet); // get 100 random points in tri - CGAL::cpp11::copy_n(g_i, 100, std::back_inserter(points_in_tri)); + std::copy_n(g_i, 100, std::back_inserter(points_in_tri)); // get 100 random points in tet - CGAL::cpp11::copy_n(g_ii, 100, std::back_inserter(points_in_tet)); + std::copy_n(g_ii, 100, std::back_inserter(points_in_tet)); // Check that we have really created 100 points. assert( points_in_tri.size() == 100); diff --git a/Generator/examples/Generator/random_points_triangle_2.cpp b/Generator/examples/Generator/random_points_triangle_2.cpp index bfb366de713..fe35e6f089a 100644 --- a/Generator/examples/Generator/random_points_triangle_2.cpp +++ b/Generator/examples/Generator/random_points_triangle_2.cpp @@ -22,7 +22,7 @@ int main() { Point_generator g(tri); // get 100 random points in tri - CGAL::cpp11::copy_n(g, 100, std::back_inserter(points)); + std::copy_n(g, 100, std::back_inserter(points)); // Check that we have really created 100 points. assert( points.size() == 100); diff --git a/Generator/examples/Generator/random_segments1.cpp b/Generator/examples/Generator/random_segments1.cpp index 60a7d6fe4cf..75aff61faf5 100644 --- a/Generator/examples/Generator/random_segments1.cpp +++ b/Generator/examples/Generator/random_segments1.cpp @@ -35,7 +35,7 @@ int main() { typedef Creator_uniform_2< Point, Segment> Seg_creator; typedef Join_input_iterator_2< P1, P2, Seg_creator> Seg_iterator; Seg_iterator g( p1, p2); - CGAL::cpp11::copy_n( g, 200, std::back_inserter(segs)); + std::copy_n( g, 200, std::back_inserter(segs)); assert( segs.size() == 200); for ( Vector::iterator i = segs.begin(); i != segs.end(); i++){ diff --git a/Generator/include/CGAL/random_convex_hull_in_disc_2.h b/Generator/include/CGAL/random_convex_hull_in_disc_2.h index cd7a53a7452..cc371b36a56 100644 --- a/Generator/include/CGAL/random_convex_hull_in_disc_2.h +++ b/Generator/include/CGAL/random_convex_hull_in_disc_2.h @@ -273,7 +273,7 @@ void random_convex_hull_in_disc_2(std::size_t n, double radius, Generator& gen, typedef typename Traits::Point_2 Points; std::list l; internal::random_convex_hull_in_disc_2(n, radius, l, gen, traits, fast); - cpp11::copy_n(l.begin(),l.size(),it); + std::copy_n(l.begin(),l.size(),it); } } // namespace CGAL diff --git a/Generator/include/CGAL/random_convex_set_2.h b/Generator/include/CGAL/random_convex_set_2.h index f6a44164bd4..d036f2db940 100644 --- a/Generator/include/CGAL/random_convex_set_2.h +++ b/Generator/include/CGAL/random_convex_set_2.h @@ -53,7 +53,7 @@ random_convex_set_2( std::size_t n, using std::partial_sum; using std::less; using std::max_element; - using CGAL::cpp11::copy_n; + using std::copy_n; typedef typename Traits::Point_2 Point_2; typedef typename Traits::FT FT; @@ -72,7 +72,7 @@ random_convex_set_2( std::size_t n, // build random point set: Container points; points.reserve( n); - CGAL::cpp11::copy_n( pg, n, back_inserter( points)); + std::copy_n( pg, n, back_inserter( points)); // compute centroid of points: // Point_2 centroid = CGAL::centroid( points.begin(), points.end(), t ); diff --git a/Generator/test/Generator/generic_random_test.cpp b/Generator/test/Generator/generic_random_test.cpp index bf906cc9b7b..eeaad9c012e 100644 --- a/Generator/test/Generator/generic_random_test.cpp +++ b/Generator/test/Generator/generic_random_test.cpp @@ -72,7 +72,7 @@ int test_triangles_2(const FT eps) CGAL::Random_points_in_triangles_2 g(triangles); // Get 100 random points in triangle range - CGAL::cpp11::copy_n(g, 100, std::back_inserter(points)); + std::copy_n(g, 100, std::back_inserter(points)); // Check that we have really created 100 points. assert( points.size() == 100); @@ -109,7 +109,7 @@ int test_triangles_3(const FT eps) CGAL::Random_points_in_triangles_3 g(triangles); // Get 100 random points in triangle range - CGAL::cpp11::copy_n(g, 100, std::back_inserter(points)); + std::copy_n(g, 100, std::back_inserter(points)); // Check that we have really created 100 points. assert(points.size() == 100); @@ -160,7 +160,7 @@ int test_T2(const FT eps) CGAL::refine_Delaunay_mesh_2(cdt, Mesh_2_criteria(0.125, 0.5)); CGAL::Random_points_in_triangle_mesh_2 g(cdt); - CGAL::cpp11::copy_n(g, 300, std::back_inserter(points)); + std::copy_n(g, 300, std::back_inserter(points)); for(std::size_t i=0; i points; CGAL::Random_points_in_triangle_mesh_3 g(polyhedron); - CGAL::cpp11::copy_n(g, 300, std::back_inserter(points)); + std::copy_n(g, 300, std::back_inserter(points)); for(std::size_t i=0; i(domain, criteria, no_perturb(), no_exude()); CGAL::Random_points_in_tetrahedral_mesh_boundary_3 g(c3t3); - CGAL::cpp11::copy_n(g, 300, std::back_inserter(points)); + std::copy_n(g, 300, std::back_inserter(points)); for(std::size_t i=0; i(domain, criteria, no_perturb(), no_exude()); CGAL::Random_points_in_tetrahedral_mesh_3 g(c3t3); - CGAL::cpp11::copy_n(g, 300, std::back_inserter(points)); + std::copy_n(g, 300, std::back_inserter(points)); for(std::size_t i=0; i points; points.reserve(1000); Random_points_in_disc_2 g1( 100.0); - CGAL::cpp11::copy_n( g1, 100, std::back_inserter(points)); + std::copy_n( g1, 100, std::back_inserter(points)); Random_points_on_circle_2 g2( 100.0); Random_points_in_square_2 g3( 100.0); Random_points_on_square_2 g4( 100.0); @@ -63,11 +63,11 @@ void test_point_generators_2() { Points_on_segment_2 g5a( Point_2( 50,-50), Point_2(-50, 50), 50); - CGAL::cpp11::copy_n( g2, 100, std::back_inserter(points)); - CGAL::cpp11::copy_n( g3, 100, std::back_inserter(points)); - CGAL::cpp11::copy_n( g4, 100, std::back_inserter(points)); - CGAL::cpp11::copy_n( g5, 50, std::back_inserter(points)); - CGAL::cpp11::copy_n( g5a, 50, std::back_inserter(points)); + std::copy_n( g2, 100, std::back_inserter(points)); + std::copy_n( g3, 100, std::back_inserter(points)); + std::copy_n( g4, 100, std::back_inserter(points)); + std::copy_n( g5, 50, std::back_inserter(points)); + std::copy_n( g5a, 50, std::back_inserter(points)); points_on_square_grid_2( 50.0, (std::size_t)1, std::back_inserter(points), Creator()); points_on_square_grid_2( 50.0, (std::size_t)2, @@ -88,7 +88,7 @@ void test_point_generators_2() { // the 100 x 100 square. 10 pixel perturbation allowed. Random_points_in_square_2 g6( 90.0); int count = 100 ; - CGAL::cpp11::copy_n( g6, count, std::back_inserter(points)); + std::copy_n( g6, count, std::back_inserter(points)); std::vector::iterator i2 = points.end(); std::vector::iterator i1 = i2 ; std::advance(i1,-count); @@ -115,14 +115,14 @@ void test_point_generators_3() { std::vector points; points.reserve(600); Random_points_in_sphere_3 g1( 100.0); - CGAL::cpp11::copy_n( g1, 100, std::back_inserter(points)); + std::copy_n( g1, 100, std::back_inserter(points)); Random_points_on_sphere_3 g2( 100.0); Random_points_in_cube_3 g3( 100.0); Random_points_on_segment_3 g4( Point_3(-100,-100, -100), Point_3( 100, 100, 100)); - CGAL::cpp11::copy_n( g2, 100, std::back_inserter(points)); - CGAL::cpp11::copy_n( g3, 100, std::back_inserter(points)); - CGAL::cpp11::copy_n( g4, 100, std::back_inserter(points)); + std::copy_n( g2, 100, std::back_inserter(points)); + std::copy_n( g3, 100, std::back_inserter(points)); + std::copy_n( g4, 100, std::back_inserter(points)); points_on_cube_grid_3( 50.0, (std::size_t)1, std::back_inserter(points), Creator()); points_on_cube_grid_3( 50.0, (std::size_t)2, @@ -160,7 +160,7 @@ void test_point_generators_d() // 100 random points in dim 36 std::cout<<" cube dim 36"< gen (36, 1.0); - CGAL::cpp11::copy_n( gen, 100, std::back_inserter(points)); + std::copy_n( gen, 100, std::back_inserter(points)); i+=100; std::cout<<" done"< gen (4, 100.0); - CGAL::cpp11::copy_n( gen, 100, std::back_inserter(points)); + std::copy_n( gen, 100, std::back_inserter(points)); std::cout<<" done"< gen (3, 1.0); - CGAL::cpp11::copy_n( gen, nb_g, std::back_inserter(points)); + std::copy_n( gen, nb_g, std::back_inserter(points)); std::cout<<" done"< gen (26, 1.0); - CGAL::cpp11::copy_n( gen, 100, std::back_inserter(points)); + std::copy_n( gen, 100, std::back_inserter(points)); std::cout<<" done"< Seg_creator; typedef CGAL::Join_input_iterator_2< Rpos_generator, Rpoc_generator, Seg_creator> Seg_iterator; Seg_iterator g( rpos, rpoc); - CGAL::cpp11::copy_n( g, 200, std::back_inserter(segments)); + std::copy_n( g, 200, std::back_inserter(segments)); Q_EMIT( changed()); } diff --git a/Interpolation/demo/Interpolation/surface_voronoi.cpp b/Interpolation/demo/Interpolation/surface_voronoi.cpp index 4ef35579a9a..c7c8f737e85 100644 --- a/Interpolation/demo/Interpolation/surface_voronoi.cpp +++ b/Interpolation/demo/Interpolation/surface_voronoi.cpp @@ -94,7 +94,7 @@ void generate_sphere_points(const int& n, //the test point + normal Point &p, Vector &normal){ CGAL::Random_points_on_sphere_3 g(r); - CGAL::cpp11::copy_n( g, n, std::back_inserter(points)); + std::copy_n( g, n, std::back_inserter(points)); p = Point(0,0, r); normal = Vector(p - CGAL::ORIGIN); } @@ -110,7 +110,7 @@ void generate_cylinder_points(const int& n, Point_2_vector points_2; points_2.reserve(n); CGAL::Random_points_on_circle_2 g(r); - CGAL::cpp11::copy_n( g, n , std::back_inserter(points_2)); + std::copy_n( g, n , std::back_inserter(points_2)); CGAL::Random random; double h; diff --git a/Interpolation/examples/Interpolation/interpolation_2.cpp b/Interpolation/examples/Interpolation/interpolation_2.cpp index a6f480313ef..e26416fb2d6 100644 --- a/Interpolation/examples/Interpolation/interpolation_2.cpp +++ b/Interpolation/examples/Interpolation/interpolation_2.cpp @@ -51,7 +51,7 @@ int main() CGAL::Random rng(1513114263); CGAL::Random_points_in_disc_2 g(r_d,rng ); - CGAL::cpp11::copy_n( g, n+m, std::back_inserter(points)); + std::copy_n( g, n+m, std::back_inserter(points)); Delaunay_triangulation T; diff --git a/Interpolation/examples/Interpolation/interpolation_vertex_with_info_2.cpp b/Interpolation/examples/Interpolation/interpolation_vertex_with_info_2.cpp index b43a2b1535e..6e5dd160759 100644 --- a/Interpolation/examples/Interpolation/interpolation_vertex_with_info_2.cpp +++ b/Interpolation/examples/Interpolation/interpolation_vertex_with_info_2.cpp @@ -90,7 +90,7 @@ int main() double r_d = 3; CGAL::Random rng(1513114263); CGAL::Random_points_in_disc_2 g(r_d, rng); - CGAL::cpp11::copy_n( g, n+m, std::back_inserter(points)); + std::copy_n( g, n+m, std::back_inserter(points)); Delaunay_triangulation T; diff --git a/Interpolation/examples/Interpolation/surface_neighbor_coordinates_3.cpp b/Interpolation/examples/Interpolation/surface_neighbor_coordinates_3.cpp index 5cd6ba9d563..2a361c1a44f 100644 --- a/Interpolation/examples/Interpolation/surface_neighbor_coordinates_3.cpp +++ b/Interpolation/examples/Interpolation/surface_neighbor_coordinates_3.cpp @@ -26,7 +26,7 @@ int main() std::cout << "Generate " << n << " random points on a sphere." << std::endl; CGAL::Random_points_on_sphere_3 g(1); - CGAL::cpp11::copy_n(g, n, std::back_inserter(points)); + std::copy_n(g, n, std::back_inserter(points)); Point_3 p(1, 0, 0); Vector_3 normal(p - CGAL::ORIGIN); diff --git a/Interpolation/test/Interpolation/include/CGAL/_test_interpolation_functions_2.cpp b/Interpolation/test/Interpolation/include/CGAL/_test_interpolation_functions_2.cpp index 022efc4cbc7..9b79b612ad7 100644 --- a/Interpolation/test/Interpolation/include/CGAL/_test_interpolation_functions_2.cpp +++ b/Interpolation/test/Interpolation/include/CGAL/_test_interpolation_functions_2.cpp @@ -288,7 +288,7 @@ void _test_interpolation_functions_2_Delaunay_without_OutputFunctor(const Dt&, c // Create n+m-4 points within a disc of radius 2 CGAL::Random_points_in_square_2 g(r); - CGAL::cpp11::copy_n(g, n+m, std::back_inserter(points)); + std::copy_n(g, n+m, std::back_inserter(points)); CGAL::Random random; @@ -467,7 +467,7 @@ void _test_interpolation_functions_2_Delaunay_with_OutputFunctor(const Dt&, cons // Create n+m-4 points within a disc of radius 2 CGAL::Random_points_in_square_2 g(r); - CGAL::cpp11::copy_n(g, n+m, std::back_inserter(points)); + std::copy_n(g, n+m, std::back_inserter(points)); CGAL::Random random; diff --git a/Interpolation/test/Interpolation/include/CGAL/_test_surface_neighbors_3.cpp b/Interpolation/test/Interpolation/include/CGAL/_test_surface_neighbors_3.cpp index a94e1970da0..7cd3afb279c 100644 --- a/Interpolation/test/Interpolation/include/CGAL/_test_surface_neighbors_3.cpp +++ b/Interpolation/test/Interpolation/include/CGAL/_test_surface_neighbors_3.cpp @@ -303,7 +303,7 @@ _test_surface_neighbors_3_sphere( const Tr & ) // Create n+m-4 points on a sphere of radius 2 CGAL::Random_points_on_sphere_3 g(r); - CGAL::cpp11::copy_n( g, n+m, std::back_inserter(points)); + std::copy_n( g, n+m, std::back_inserter(points)); for(int i=0; i g(r); - CGAL::cpp11::copy_n(g, n, std::back_inserter(points_2_data)); + std::copy_n(g, n, std::back_inserter(points_2_data)); } for(int i=0; i < n; i++) { @@ -365,7 +365,7 @@ _test_surface_neighbors_3_cube(const Tr &, const Transformation& std::vector points_2_test; points_2_test.reserve(m); CGAL::Random_points_in_square_2 g2(r-1.0); - CGAL::cpp11::copy_n(g2, m, std::back_inserter(points_2_test)); + std::copy_n(g2, m, std::back_inserter(points_2_test)); int k=0; for(int i=0;itwin(); - if (cpp11::next(f->facet_cycles_begin())==f->facet_cycles_end()) + if (std::next(f->facet_cycles_begin())==f->facet_cycles_end()) { std::size_t cycle_length = 3; if (triangulate_all_faces) diff --git a/NewKernel_d/include/CGAL/NewKernel_d/Lazy_cartesian.h b/NewKernel_d/include/CGAL/NewKernel_d/Lazy_cartesian.h index bce1522a0fe..0ea81b53900 100644 --- a/NewKernel_d/include/CGAL/NewKernel_d/Lazy_cartesian.h +++ b/NewKernel_d/include/CGAL/NewKernel_d/Lazy_cartesian.h @@ -38,7 +38,7 @@ struct Nth_iterator_element : private Store_kernel { typedef typename Get_type::value_tag>::type result_type; template result_type operator()(CGAL_FORWARDABLE(U) u, int i) const { typename Get_functor >::type ci(this->kernel()); - return *cpp0x::next(ci(CGAL_FORWARD(U,u),Begin_tag()),i); + return *std::next(ci(CGAL_FORWARD(U,u),Begin_tag()),i); } }; //typedef typename Functor::nth_element>::type nth_elem; diff --git a/Optimal_transportation_reconstruction_2/examples/Optimal_transportation_reconstruction_2/otr2_simplest_example.cpp b/Optimal_transportation_reconstruction_2/examples/Optimal_transportation_reconstruction_2/otr2_simplest_example.cpp index 3c22177dc0b..cef2ecc34b0 100644 --- a/Optimal_transportation_reconstruction_2/examples/Optimal_transportation_reconstruction_2/otr2_simplest_example.cpp +++ b/Optimal_transportation_reconstruction_2/examples/Optimal_transportation_reconstruction_2/otr2_simplest_example.cpp @@ -19,7 +19,7 @@ int main () // Generate a set of random points on the boundary of a square. std::vector points; CGAL::Random_points_on_square_2 point_generator(1.); - CGAL::cpp11::copy_n(point_generator, 100, std::back_inserter(points)); + std::copy_n(point_generator, 100, std::back_inserter(points)); Otr otr(points); diff --git a/Optimal_transportation_reconstruction_2/examples/Optimal_transportation_reconstruction_2/otr2_simplest_example_with_tolerance.cpp b/Optimal_transportation_reconstruction_2/examples/Optimal_transportation_reconstruction_2/otr2_simplest_example_with_tolerance.cpp index 091552dcc93..2d92652a865 100644 --- a/Optimal_transportation_reconstruction_2/examples/Optimal_transportation_reconstruction_2/otr2_simplest_example_with_tolerance.cpp +++ b/Optimal_transportation_reconstruction_2/examples/Optimal_transportation_reconstruction_2/otr2_simplest_example_with_tolerance.cpp @@ -20,7 +20,7 @@ int main () // Generate 100 random points on the boundary of a square. std::vector points; CGAL::Random_points_on_square_2 point_generator(1.); - CGAL::cpp11::copy_n(point_generator, 100, std::back_inserter(points)); + std::copy_n(point_generator, 100, std::back_inserter(points)); Otr otr(points); // no mass given, one unit mass per point assumed otr.run_under_wasserstein_tolerance(0.1); diff --git a/Optimal_transportation_reconstruction_2/test/Optimal_transportation_reconstruction_2/otr2_epeck.cpp b/Optimal_transportation_reconstruction_2/test/Optimal_transportation_reconstruction_2/otr2_epeck.cpp index cbac6acba41..22b18acef72 100644 --- a/Optimal_transportation_reconstruction_2/test/Optimal_transportation_reconstruction_2/otr2_epeck.cpp +++ b/Optimal_transportation_reconstruction_2/test/Optimal_transportation_reconstruction_2/otr2_epeck.cpp @@ -19,7 +19,7 @@ int main () // Generate a set of random points on the boundary of a square. std::vector points; CGAL::Random_points_on_square_2 point_generator(1.); - CGAL::cpp11::copy_n(point_generator, 100, std::back_inserter(points)); + std::copy_n(point_generator, 100, std::back_inserter(points)); Otr otr(points); otr.run(100); // 100 steps diff --git a/Periodic_2_triangulation_2/examples/Periodic_2_triangulation_2/p2t2_hierarchy.cpp b/Periodic_2_triangulation_2/examples/Periodic_2_triangulation_2/p2t2_hierarchy.cpp index 2cd3eed17a9..2dfbcd5f774 100644 --- a/Periodic_2_triangulation_2/examples/Periodic_2_triangulation_2/p2t2_hierarchy.cpp +++ b/Periodic_2_triangulation_2/examples/Periodic_2_triangulation_2/p2t2_hierarchy.cpp @@ -31,7 +31,7 @@ int main( ) std::cout << "insertion of 1000 random points" << std::endl; Triangulation t(Iso_rectangle(-1,-1, 1,1)); CGAL::Random_points_in_square_2 g(1.); - CGAL::cpp11::copy_n(g, 1000, std::back_inserter(t)); + std::copy_n(g, 1000, std::back_inserter(t)); //verbose mode of is_valid ; shows the number of vertices at each level std::cout << "The number of vertices at successive levels" << std::endl; diff --git a/Periodic_4_hyperbolic_triangulation_2/examples/Periodic_4_hyperbolic_triangulation_2/p4ht2_example_insertion.cpp b/Periodic_4_hyperbolic_triangulation_2/examples/Periodic_4_hyperbolic_triangulation_2/p4ht2_example_insertion.cpp index 363ef2332e3..bf5cdf6d226 100644 --- a/Periodic_4_hyperbolic_triangulation_2/examples/Periodic_4_hyperbolic_triangulation_2/p4ht2_example_insertion.cpp +++ b/Periodic_4_hyperbolic_triangulation_2/examples/Periodic_4_hyperbolic_triangulation_2/p4ht2_example_insertion.cpp @@ -32,7 +32,7 @@ int main(int argc, char** argv) // Some of the points will be outside the octagon, so they will not be inserted. std::vector pts; CGAL::Random_points_in_disc_2 g(0.85); - CGAL::cpp11::copy_n(g, N1, std::back_inserter(pts)); + std::copy_n(g, N1, std::back_inserter(pts)); // The triangulation is automatically initialized with the dummy points. Triangulation tr; diff --git a/Point_set_2/test/Point_set_2/range_search_fcn.cpp b/Point_set_2/test/Point_set_2/range_search_fcn.cpp index 462efbd30a5..2d0ed865860 100644 --- a/Point_set_2/test/Point_set_2/range_search_fcn.cpp +++ b/Point_set_2/test/Point_set_2/range_search_fcn.cpp @@ -45,7 +45,7 @@ int main() std::list points; std::list LV; - CGAL::cpp11::copy_n(rpg, 1000, std::back_inserter(points)); + std::copy_n(rpg, 1000, std::back_inserter(points)); PSet.insert(points.begin(), points.end()); Point_2 p(10, 10), q(50, 10), r(50, 50), s(10, 50); diff --git a/Point_set_2/test/Point_set_2/test_range_search.cpp b/Point_set_2/test/Point_set_2/test_range_search.cpp index 833ed4d0fc0..52b6ea4535f 100644 --- a/Point_set_2/test/Point_set_2/test_range_search.cpp +++ b/Point_set_2/test/Point_set_2/test_range_search.cpp @@ -42,7 +42,7 @@ int main() std::list points; std::list LV; - CGAL::cpp11::copy_n(rpg, 1000, std::back_inserter(points)); + std::copy_n(rpg, 1000, std::back_inserter(points)); PSet.insert(points.begin(), points.end()); Point_2 p(10, 10), q(50, 10), r(50, 50), s(10, 50); diff --git a/Point_set_processing_3/examples/Point_set_processing_3/callback_example.cpp b/Point_set_processing_3/examples/Point_set_processing_3/callback_example.cpp index 59df43360e0..34f7d5aa751 100644 --- a/Point_set_processing_3/examples/Point_set_processing_3/callback_example.cpp +++ b/Point_set_processing_3/examples/Point_set_processing_3/callback_example.cpp @@ -74,7 +74,7 @@ int main (int argc, char* argv[]) std::vector points; points.reserve (N); Generator generator(100.); - CGAL::cpp11::copy_n (generator, N, std::back_inserter(points)); + std::copy_n (generator, N, std::back_inserter(points)); // Compute average spacing FT average_spacing = CGAL::compute_average_spacing diff --git a/Point_set_processing_3/include/CGAL/Point_set_processing_3/internal/Voronoi_covariance_3/voronoi_covariance_3.h b/Point_set_processing_3/include/CGAL/Point_set_processing_3/internal/Voronoi_covariance_3/voronoi_covariance_3.h index b90be9d285b..0f7792cbcb7 100644 --- a/Point_set_processing_3/include/CGAL/Point_set_processing_3/internal/Voronoi_covariance_3/voronoi_covariance_3.h +++ b/Point_set_processing_3/include/CGAL/Point_set_processing_3/internal/Voronoi_covariance_3/voronoi_covariance_3.h @@ -181,7 +181,7 @@ namespace CGAL { for(typename boost::graph_traits::face_descriptor fd : faces(P)) { Halfedge_around_face_circulator - h0(halfedge(fd,P),P), hf = h0--, hs = cpp11::next(hf); + h0(halfedge(fd,P),P), hf = h0--, hs = std::next(hf); while(hs != h0) { diff --git a/Polygon/include/CGAL/Polygon_2.h b/Polygon/include/CGAL/Polygon_2.h index cf14b10be88..deb45c86b89 100644 --- a/Polygon/include/CGAL/Polygon_2.h +++ b/Polygon/include/CGAL/Polygon_2.h @@ -438,7 +438,7 @@ class Polygon_2 { const Point_2& vertex(std::size_t i) const { CGAL_precondition( i < d_container.size() ); - return *(cpp11::next(d_container.begin(), i)); + return *(std::next(d_container.begin(), i)); } @@ -448,7 +448,7 @@ class Polygon_2 { /// Returns the `i`-th edge. Segment_2 edge(std::size_t i) const - { return *(cpp11::next(edges_begin(), i)); } + { return *(std::next(edges_begin(), i)); } /// @} diff --git a/Polygon/include/CGAL/Polygon_2/Polygon_2_algorithms_impl.h b/Polygon/include/CGAL/Polygon_2/Polygon_2_algorithms_impl.h index ecec83d624d..363d5e52e01 100644 --- a/Polygon/include/CGAL/Polygon_2/Polygon_2_algorithms_impl.h +++ b/Polygon/include/CGAL/Polygon_2/Polygon_2_algorithms_impl.h @@ -74,7 +74,7 @@ OutputForwardIterator filter_collinear_points(InputForwardIterator first, typedef typename K::FT FT; typedef typename K::Point_2 Point; - InputForwardIterator last = cpp11::prev(beyond); + InputForwardIterator last = std::prev(beyond); InputForwardIterator vit = first, vit_next = vit, vit_next_2 = vit, vend = vit; ++vit_next; diff --git a/Polygon_mesh_processing/include/CGAL/Polygon_mesh_processing/border.h b/Polygon_mesh_processing/include/CGAL/Polygon_mesh_processing/border.h index 74e18d570b9..165316ecf5a 100644 --- a/Polygon_mesh_processing/include/CGAL/Polygon_mesh_processing/border.h +++ b/Polygon_mesh_processing/include/CGAL/Polygon_mesh_processing/border.h @@ -113,7 +113,7 @@ namespace Polygon_mesh_processing { boost::true_type>::value) { typename boost::range_iterator::type it = boost::const_begin(faces); - if (get(fmap, *it) == get(fmap, *cpp11::next(it))) + if (get(fmap, *it) == get(fmap, *std::next(it))) { std::cerr << "WARNING : the internal property map for CGAL::face_index_t" << std::endl << " is not properly initialized." << std::endl diff --git a/Polygon_mesh_processing/include/CGAL/Polygon_mesh_processing/distance.h b/Polygon_mesh_processing/include/CGAL/Polygon_mesh_processing/distance.h index bae6934d142..84e3ba828d7 100644 --- a/Polygon_mesh_processing/include/CGAL/Polygon_mesh_processing/distance.h +++ b/Polygon_mesh_processing/include/CGAL/Polygon_mesh_processing/distance.h @@ -455,7 +455,7 @@ sample_triangle_mesh(const TriangleMesh& tm, // sample the triangle face Random_points_in_triangle_3 g(points[0], points[1], points[2]); - out=CGAL::cpp11::copy_n(g, nb_points, out); + out=std::copy_n(g, nb_points, out); } } // sample edges @@ -477,7 +477,7 @@ sample_triangle_mesh(const TriangleMesh& tm, // now do the sampling of the edge Random_points_on_segment_3 g(get(pmap, source(ed,tm)), get(pmap, target(ed,tm))); - out=CGAL::cpp11::copy_n(g, nb_points, out); + out=std::copy_n(g, nb_points, out); } } } @@ -498,7 +498,7 @@ sample_triangle_mesh(const TriangleMesh& tm, nb_points = static_cast( std::ceil(g.mesh_area()*nb_pts_a_u) ); } - out = CGAL::cpp11::copy_n(g, nb_points, out); + out = std::copy_n(g, nb_points, out); } // sample edges if (smpl_dgs) @@ -514,7 +514,7 @@ sample_triangle_mesh(const TriangleMesh& tm, nb_points = static_cast( std::ceil( g.mesh_length()*nb_pts_a_u) ); } - out = CGAL::cpp11::copy_n(g, nb_points, out); + out = std::copy_n(g, nb_points, out); } } 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 219e8c74b0d..48fc7f6d8a3 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 @@ -1579,7 +1579,7 @@ public: for(Hedge_iterator it : to_rm) { patches_of_tm1[i].interior_edges.push_back(*it); - if (it!=cpp11::prev(patches_of_tm1[i].shared_edges.end())) + if (it!=std::prev(patches_of_tm1[i].shared_edges.end())) std::swap(patches_of_tm1[i].shared_edges.back(), *it); patches_of_tm1[i].shared_edges.pop_back(); } diff --git a/Polygon_mesh_processing/include/CGAL/Polygon_mesh_processing/internal/Corefinement/intersection_impl.h b/Polygon_mesh_processing/include/CGAL/Polygon_mesh_processing/internal/Corefinement/intersection_impl.h index 8d1bfa8166e..935fa875515 100644 --- a/Polygon_mesh_processing/include/CGAL/Polygon_mesh_processing/internal/Corefinement/intersection_impl.h +++ b/Polygon_mesh_processing/include/CGAL/Polygon_mesh_processing/internal/Corefinement/intersection_impl.h @@ -705,7 +705,7 @@ class Intersection_of_triangle_meshes CGAL_precondition(all_edges[0]==h_1 || all_edges[0]==opposite(h_1,tm1)); // #ifdef USE_DETECTION_MULTIPLE_DEFINED_EDGES - // check_coplanar_edges(cpp11::next(all_edges.begin()), + // check_coplanar_edges(std::next(all_edges.begin()), // all_edges.end(),CGAL::cpp11::get<1>(res),type); // #endif @@ -981,8 +981,8 @@ class Intersection_of_triangle_meshes // with the point found. typename Faces_to_nodes_map::iterator it_seg3 = find_it; // first check if there is only one such edge (no test is needed then) - if (cpp11::next(it_seg3)!=f_to_node.end() && - cpp11::next(it_seg3)->first.first == it_seg3->first.first) + if (std::next(it_seg3)!=f_to_node.end() && + std::next(it_seg3)->first.first == it_seg3->first.first) { while(true) { diff --git a/Polygon_mesh_processing/include/CGAL/Polygon_mesh_processing/merge_border_vertices.h b/Polygon_mesh_processing/include/CGAL/Polygon_mesh_processing/merge_border_vertices.h index fffa67fe685..a37799e7c63 100644 --- a/Polygon_mesh_processing/include/CGAL/Polygon_mesh_processing/merge_border_vertices.h +++ b/Polygon_mesh_processing/include/CGAL/Polygon_mesh_processing/merge_border_vertices.h @@ -122,10 +122,10 @@ void detect_identical_mergeable_vertices( if (hedges_with_identical_point_target.empty()) return; std::set< std::pair >::iterator it1 = intervals.begin(), end2 = intervals.end(), - end1 = cpp11::prev(end2), + end1 = std::prev(end2), it2; for (; it1!=end1; ++it1) - for(it2=cpp11::next(it1); it2!= end2; ++it2 ) + for(it2=std::next(it1); it2!= end2; ++it2 ) { CGAL_assertion(it1->firstfirst); CGAL_assertion(it1->first < it1->second && it2->first < it2->second); diff --git a/Polygon_mesh_processing/include/CGAL/Polygon_mesh_processing/orientation.h b/Polygon_mesh_processing/include/CGAL/Polygon_mesh_processing/orientation.h index 9d461ab2a19..1728e1d45ca 100644 --- a/Polygon_mesh_processing/include/CGAL/Polygon_mesh_processing/orientation.h +++ b/Polygon_mesh_processing/include/CGAL/Polygon_mesh_processing/orientation.h @@ -197,7 +197,7 @@ bool is_outward_oriented(const PolygonMesh& pmesh, internal::Compare_vertex_points_z_3 less_z(vpmap, gt); typename boost::graph_traits::vertex_descriptor v_max = *(vertices(pmesh).first); for (typename boost::graph_traits::vertex_iterator - vit=cpp11::next(vertices(pmesh).first), vit_end = vertices(pmesh).second; + vit=std::next(vertices(pmesh).first), vit_end = vertices(pmesh).second; vit!=vit_end; ++vit) { // skip isolated vertices diff --git a/Polygon_mesh_processing/include/CGAL/Polygon_mesh_processing/polygon_soup_to_polygon_mesh.h b/Polygon_mesh_processing/include/CGAL/Polygon_mesh_processing/polygon_soup_to_polygon_mesh.h index 8877a2a2c01..f1ef6e53093 100644 --- a/Polygon_mesh_processing/include/CGAL/Polygon_mesh_processing/polygon_soup_to_polygon_mesh.h +++ b/Polygon_mesh_processing/include/CGAL/Polygon_mesh_processing/polygon_soup_to_polygon_mesh.h @@ -163,7 +163,7 @@ public: if (nb_edges<3) return false; std::set polygon_vertices; - V_ID prev= *cpp11::prev(boost::end(polygon)); + V_ID prev= *std::prev(boost::end(polygon)); for(V_ID id : polygon) { if (max_id side_one, side_two; @@ -1440,8 +1440,8 @@ bool remove_degenerate_faces( TriangleMesh& tmesh, CGAL_assertion( target(side_one.back(), tmesh) == *ref_vertices.second ); CGAL_assertion( target(side_two.back(), tmesh) == *ref_vertices.second ); - typename Sorted_point_set::iterator it_pt = cpp11::next(sorted_points.begin()), - it_pt_end = cpp11::prev(sorted_points.end()); + typename Sorted_point_set::iterator it_pt = std::next(sorted_points.begin()), + it_pt_end = std::prev(sorted_points.end()); bool non_collapsable = false; typename std::vector::iterator side_one_it = side_one.begin(); @@ -1530,10 +1530,10 @@ bool remove_degenerate_faces( TriangleMesh& tmesh, // now split each side to contains the same sequence of points // first side int hi=0; - for (typename Sorted_point_set::iterator it=cpp11::next(sorted_points.begin()), + for (typename Sorted_point_set::iterator it=std::next(sorted_points.begin()), it_end=sorted_points.end(); it!=it_end; ++it) { - CGAL_assertion( *cpp11::prev(it) == get(vpmap, source(side_one[hi], tmesh) ) ); + CGAL_assertion( *std::prev(it) == get(vpmap, source(side_one[hi], tmesh) ) ); if( *it != get(vpmap, target(side_one[hi], tmesh) ) ){ // split the edge and update the point halfedge_descriptor h1 = next(opposite(side_one[hi], tmesh), tmesh); @@ -1554,10 +1554,10 @@ bool remove_degenerate_faces( TriangleMesh& tmesh, } // second side hi=0; - for (typename Sorted_point_set::iterator it=cpp11::next(sorted_points.begin()), + for (typename Sorted_point_set::iterator it=std::next(sorted_points.begin()), it_end=sorted_points.end(); it!=it_end; ++it) { - CGAL_assertion( *cpp11::prev(it) == get(vpmap, source(side_two[hi], tmesh) ) ); + CGAL_assertion( *std::prev(it) == get(vpmap, source(side_two[hi], tmesh) ) ); if( *it != get(vpmap, target(side_two[hi], tmesh) ) ){ // split the edge and update the point halfedge_descriptor h2 = Euler::split_edge(side_two[hi], tmesh); diff --git a/Polyhedron/demo/Polyhedron/Plugins/PMP/Distance_plugin.cpp b/Polyhedron/demo/Polyhedron/Plugins/PMP/Distance_plugin.cpp index 5e0543a4a31..a3f4b4cc344 100644 --- a/Polyhedron/demo/Polyhedron/Plugins/PMP/Distance_plugin.cpp +++ b/Polyhedron/demo/Polyhedron/Plugins/PMP/Distance_plugin.cpp @@ -222,7 +222,7 @@ private: Kernel::Point_3 &q = get(vpmap,target(next(halfedge(f,*poly),*poly),*poly)); Kernel::Point_3 &r = get(vpmap,target(next(next(halfedge(f,*poly),*poly),*poly),*poly)); CGAL::Random_points_in_triangle_3 g(p, q, r); - CGAL::cpp11::copy_n(g, nb_points, std::back_inserter(sampled_points)); + std::copy_n(g, nb_points, std::back_inserter(sampled_points)); sampled_points.push_back(p); sampled_points.push_back(q); sampled_points.push_back(r); diff --git a/STL_Extension/doc/STL_Extension/CGAL/algorithm.h b/STL_Extension/doc/STL_Extension/CGAL/algorithm.h index c5a65a3ab01..1b47e156044 100644 --- a/STL_Extension/doc/STL_Extension/CGAL/algorithm.h +++ b/STL_Extension/doc/STL_Extension/CGAL/algorithm.h @@ -7,7 +7,7 @@ namespace CGAL { /*! \ingroup STLAlgos -\deprecated This function is deprecated, CGAL::cpp11::copy_n should be +\deprecated This function is deprecated, std::copy_n should be used instead. Copies the first `n` items from `first` to `result`. @@ -95,7 +95,7 @@ namespace CGAL { /*! \ingroup STLAlgos -\deprecated This function is deprecated. `CGAL::cpp11::prev` should be used +\deprecated This function is deprecated. `std::prev` should be used instead. Returns the previous iterator, @@ -115,7 +115,7 @@ namespace CGAL { /*! \ingroup STLAlgos -\deprecated This function is deprecated. `CGAL::cpp11::next` should be used +\deprecated This function is deprecated. `std::next` should be used instead. @@ -130,67 +130,6 @@ the result of `operator++` on a forward iterator. template ForwardIterator successor(ForwardIterator it); -namespace cpp11 { - -/*! -\ingroup STLAlgos - -The function returns the result of `operator++` on a -`ForwardIterator`. The exact behaviour is described in Paragraph 24.4.4 -of the C++ standard draft -N3242. - -\note There is actually no function in namespace `CGAL::cpp11` with this -name, but a using declaration which imports a function from another -namespace. By order of priority: the one in namespace `std` is used -(provided by C++0x), if not found, then the one in namespace `boost` -is used. - - - -\sa boost::next -\sa `CGAL::cpp11::prev()` - -*/ -template -Iterator next(ForwardIterator it); - -/*! -\ingroup STLAlgos - -The function returns the result of `operator--` on -a `BidirectionalIterator`. The exact behaviour is described in -Paragraph 24.4.4 of the C++ standard draft -N3242. - -\note If C++0x is available the function `std::prev` is imported into -the namespace `CGAL::cpp11`, otherwise `CGAL::cpp11::prev` is declared with the -signature as given in Paragraph 24.4.4 of the ISO C++ Standard -and forwarded to `boost::prior`. -*/ -template -Iterator prev(BidirectionalIterator it); - - -/*! -\ingroup STLAlgos - -Copies `n` items from an -input iterator to an output iterator. Its exact behaviour is defined -in Paragraph 25.3.1 of the C++ standard draft -N3242. - -\note This provides an implementation of the standard function -`copy_n` from the C++0x standard. If `copy_n` is available -in the `std::` namespace a using declaration is used, otherwise -an alternative implementation from \cgal is used. -*/ - -template< class InputIterator, class Size, class OutputIterator> -OutputIterator copy_n(InputIterator first, Size count, OutputIterator result); - -} /* namespace cpp11 */ - namespace cpp98 { /*! diff --git a/STL_Extension/doc/STL_Extension/PackageDescription.txt b/STL_Extension/doc/STL_Extension/PackageDescription.txt index cc6cf54bc2c..df921c5c6e0 100644 --- a/STL_Extension/doc/STL_Extension/PackageDescription.txt +++ b/STL_Extension/doc/STL_Extension/PackageDescription.txt @@ -41,11 +41,11 @@ - `CGAL::Multiset` \cgalCRPSection{Generic Algorithms} -- `CGAL::cpp11::copy_n` +- `std::copy_n` - `CGAL::copy_n` - `CGAL::min_max_element` -- `CGAL::cpp11::next` -- `CGAL::cpp11::prev` +- `std::next` +- `std::prev` - `CGAL::predecessor` - `CGAL::successor` diff --git a/STL_Extension/include/CGAL/algorithm.h b/STL_Extension/include/CGAL/algorithm.h index 717593a22e0..75339d7cb91 100644 --- a/STL_Extension/include/CGAL/algorithm.h +++ b/STL_Extension/include/CGAL/algorithm.h @@ -39,78 +39,8 @@ #include #include -#ifdef CGAL_CFG_NO_CPP0X_NEXT_PREV -# include -#endif - namespace CGAL { -namespace cpp11 { -#ifndef CGAL_CFG_NO_CPP0X_NEXT_PREV - using std::next; - using std::prev; -#else - using boost::next; - - // boost provides prior, we go with the standard declaration as - // described in $24.4.4 and forward it to boost prior - template - BidirectionalIterator prev( BidirectionalIterator x, - typename std::iterator_traits::difference_type n = 1) - { - return boost::prior(x, n); - } -#endif -} // namespace cpp11 - -namespace cpp0x = cpp11; - -// copy_n is usually in the STL as well, but not in the official -// standard. We provide our own copy_n. It is planned for C++0x. -// Our own version is declared deprecated, if std::copy_n is -// available. - -#ifndef CGAL_CFG_NO_CPP0X_COPY_N -#ifndef CGAL_NO_DEPRECATED_CODE -template -CGAL_DEPRECATED OutputIterator copy_n( InputIterator first, Size n, OutputIterator result ) -{ - // copies the first `n' items from `first' to `result'. Returns - // the value of `result' after inserting the `n' items. - while( n--) { - *result = *first; - first++; - result++; - } - return result; -} -#endif // no CGAL_NO_DEPRECATED_CODE -#else // CGAL_CFG_NO_CPP0X_COPY_N -template -OutputIterator copy_n( InputIterator first, Size n, OutputIterator result ) -{ - // copies the first `n' items from `first' to `result'. Returns - // the value of `result' after inserting the `n' items. - while( n--) { - *result = *first; - first++; - result++; - } - return result; -} -#endif // CGAL_CFG_NO_CPP0X_COPY_N - -namespace cpp11 { -#ifndef CGAL_CFG_NO_CPP0X_COPY_N - using std::copy_n; -#else - using CGAL::copy_n; -#endif -} // cpp11 - -namespace cpp0x = cpp11; - - // Not documented template inline bool diff --git a/STL_Extension/test/STL_Extension/test_namespaces.cpp b/STL_Extension/test/STL_Extension/test_namespaces.cpp index cad548729ef..d27f39047c5 100644 --- a/STL_Extension/test/STL_Extension/test_namespaces.cpp +++ b/STL_Extension/test/STL_Extension/test_namespaces.cpp @@ -25,11 +25,11 @@ int main() CGAL::copy_n(arr.begin(), 3, arr2.begin()); CGAL::cpp0x::copy_n(arr.begin(), 3, arr2.begin()); - CGAL::cpp11::copy_n(arr.begin(), 3, arr2.begin()); + std::copy_n(arr.begin(), 3, arr2.begin()); CGAL::cpp0x::prev(arr.end()); - CGAL::cpp11::prev(arr.end()); + std::prev(arr.end()); CGAL::cpp0x::next(arr.begin()); - CGAL::cpp11::next(arr.begin()); + std::next(arr.begin()); return 0; } diff --git a/STL_Extension/test/STL_Extension/test_stl_extension.cpp b/STL_Extension/test/STL_Extension/test_stl_extension.cpp index 73a8a806570..cbb6643dc0c 100644 --- a/STL_Extension/test/STL_Extension/test_stl_extension.cpp +++ b/STL_Extension/test/STL_Extension/test_stl_extension.cpp @@ -8156,7 +8156,7 @@ void test_prev_next() V.push_back(2); V.push_back(3); - assert(cpp11::next(cpp11::next(V.begin())) == cpp11::prev(V.end())); + assert(std::next(std::next(V.begin())) == std::prev(V.end())); } void test_copy_n() { @@ -8165,7 +8165,7 @@ void test_copy_n() { V.push_back(i); std::vector V2(5); - cpp11::copy_n(V.begin(), 5, V2.begin()); + std::copy_n(V.begin(), 5, V2.begin()); assert(std::equal(V2.begin(), V2.end(), V.begin())); } diff --git a/Spatial_searching/test/Spatial_searching/Building_kd_tree_with_ddim_points.cpp b/Spatial_searching/test/Spatial_searching/Building_kd_tree_with_ddim_points.cpp index d045a1978ea..f8801773fc8 100644 --- a/Spatial_searching/test/Spatial_searching/Building_kd_tree_with_ddim_points.cpp +++ b/Spatial_searching/test/Spatial_searching/Building_kd_tree_with_ddim_points.cpp @@ -97,7 +97,7 @@ int main() { std::vector points; Point_generator g(3); - CGAL::cpp11::copy_n( g, N, std::back_inserter(points)); + std::copy_n( g, N, std::back_inserter(points)); g++; Point query = *g; diff --git a/Spatial_searching/test/Spatial_searching/Orthogonal_incremental_neighbor_search.cpp b/Spatial_searching/test/Spatial_searching/Orthogonal_incremental_neighbor_search.cpp index 3489ce6ae54..2950221c047 100644 --- a/Spatial_searching/test/Spatial_searching/Orthogonal_incremental_neighbor_search.cpp +++ b/Spatial_searching/test/Spatial_searching/Orthogonal_incremental_neighbor_search.cpp @@ -57,7 +57,7 @@ void run() // in a register with a distance in memory CGAL::Set_ieee_double_precision pfr; - CGAL::cpp11::copy_n( g, 1000, std::back_inserter(points)); + std::copy_n( g, 1000, std::back_inserter(points)); typename K_search::Tree t( boost::make_transform_iterator(points.begin(),Create_point_with_info()), @@ -108,7 +108,7 @@ bool search(bool nearest) { std::vector points; Random_points g(1); - CGAL::cpp11::copy_n( g, 1000, std::back_inserter(points)); + std::copy_n( g, 1000, std::back_inserter(points)); typename K_search::Tree tree( boost::make_transform_iterator(points.begin(),Create_point_with_info()), diff --git a/Spatial_searching/test/Spatial_searching/Splitters.cpp b/Spatial_searching/test/Spatial_searching/Splitters.cpp index ad5a24ea04b..dd5cd4da9af 100644 --- a/Spatial_searching/test/Spatial_searching/Splitters.cpp +++ b/Spatial_searching/test/Spatial_searching/Splitters.cpp @@ -92,7 +92,7 @@ main() { Vector points; Random_points g( 150.0); - CGAL::cpp11::copy_n( g, 1000, std::back_inserter(points)); + std::copy_n( g, 1000, std::back_inserter(points)); g++; Point query = *g; diff --git a/Straight_skeleton_2/include/CGAL/IO/Dxf_writer.h b/Straight_skeleton_2/include/CGAL/IO/Dxf_writer.h index ee6859495a1..952002d18a5 100644 --- a/Straight_skeleton_2/include/CGAL/IO/Dxf_writer.h +++ b/Straight_skeleton_2/include/CGAL/IO/Dxf_writer.h @@ -126,7 +126,7 @@ public: while ( lCurrVertex != aVerticesEnd ) { - XY_Iterator lNextVertex = ( lCurrVertex == lLastVertex ? lFirstVertex : CGAL::cpp11::next(lCurrVertex) ) ; + XY_Iterator lNextVertex = ( lCurrVertex == lLastVertex ? lFirstVertex : std::next(lCurrVertex) ) ; add_segment_2 ( *lCurrVertex, *lNextVertex, aLayer, aColor ) ; diff --git a/Straight_skeleton_2/include/CGAL/Straight_skeleton_2/Straight_skeleton_builder_2_impl.h b/Straight_skeleton_2/include/CGAL/Straight_skeleton_2/Straight_skeleton_builder_2_impl.h index 8012cd8cc39..af50e58c3c7 100644 --- a/Straight_skeleton_2/include/CGAL/Straight_skeleton_2/Straight_skeleton_builder_2_impl.h +++ b/Straight_skeleton_2/include/CGAL/Straight_skeleton_2/Straight_skeleton_builder_2_impl.h @@ -1492,7 +1492,7 @@ void Straight_skeleton_builder_2::RelinkBisectorsAroundMultinode( Verte first_he->HBase_base::set_vertex(v0); - for ( typename Halfedge_handle_vector::iterator i = cpp11::next(aLinks.begin()), ei = aLinks.end(); i != ei ; ++ i ) + for ( typename Halfedge_handle_vector::iterator i = std::next(aLinks.begin()), ei = aLinks.end(); i != ei ; ++ i ) { Halfedge_handle he = *i ; diff --git a/Straight_skeleton_2/include/CGAL/compute_outer_frame_margin.h b/Straight_skeleton_2/include/CGAL/compute_outer_frame_margin.h index 6ed2d0d1b2b..798f075f961 100644 --- a/Straight_skeleton_2/include/CGAL/compute_outer_frame_margin.h +++ b/Straight_skeleton_2/include/CGAL/compute_outer_frame_margin.h @@ -58,14 +58,14 @@ boost::optional< typename Traits::FT > compute_outer_frame_margin ( ForwardPoint FT lMaxSDist(0.0) ; - ForwardPointIterator lLast = CGAL::cpp11::prev(aEnd) ; + ForwardPointIterator lLast = std::prev(aEnd) ; bool lOverflow = false ; for ( ForwardPointIterator lCurr = aBegin ; lCurr != aEnd ; ++ lCurr ) { - ForwardPointIterator lPrev = ( lCurr == aBegin ? lLast : CGAL::cpp11::prev (lCurr) ) ; - ForwardPointIterator lNext = ( lCurr == lLast ? aBegin : CGAL::cpp11::next (lCurr) ) ; + ForwardPointIterator lPrev = ( lCurr == aBegin ? lLast : std::prev (lCurr) ) ; + ForwardPointIterator lNext = ( lCurr == lLast ? aBegin : std::next (lCurr) ) ; if ( !equal(*lPrev,*lCurr) && !equal(*lCurr,*lNext) && !collinear(*lPrev,*lCurr,*lNext) ) { diff --git a/Surface_mesh_deformation/examples/Surface_mesh_deformation/all_roi_assign_example.cpp b/Surface_mesh_deformation/examples/Surface_mesh_deformation/all_roi_assign_example.cpp index acf52c41fb4..683f98e3625 100644 --- a/Surface_mesh_deformation/examples/Surface_mesh_deformation/all_roi_assign_example.cpp +++ b/Surface_mesh_deformation/examples/Surface_mesh_deformation/all_roi_assign_example.cpp @@ -37,8 +37,8 @@ int main() deform_mesh.insert_roi_vertices(vb, ve); // Select two control vertices ... - vertex_descriptor control_1 = *CGAL::cpp11::next(vb, 213); - vertex_descriptor control_2 = *CGAL::cpp11::next(vb, 157); + vertex_descriptor control_1 = *std::next(vb, 213); + vertex_descriptor control_2 = *std::next(vb, 157); // ... and insert them deform_mesh.insert_control_vertex(control_1); @@ -75,7 +75,7 @@ int main() output.close(); // Add another control vertex which requires another call to preprocess - vertex_descriptor control_3 = *CGAL::cpp11::next(vb, 92); + vertex_descriptor control_3 = *std::next(vb, 92); deform_mesh.insert_control_vertex(control_3); // The prepocessing step is again needed diff --git a/Surface_mesh_deformation/examples/Surface_mesh_deformation/all_roi_assign_example_Surface_mesh.cpp b/Surface_mesh_deformation/examples/Surface_mesh_deformation/all_roi_assign_example_Surface_mesh.cpp index 3157115a91e..13aad0e6a4e 100644 --- a/Surface_mesh_deformation/examples/Surface_mesh_deformation/all_roi_assign_example_Surface_mesh.cpp +++ b/Surface_mesh_deformation/examples/Surface_mesh_deformation/all_roi_assign_example_Surface_mesh.cpp @@ -27,8 +27,8 @@ int main() deform_mesh.insert_roi_vertices(vb, ve); // Select two control vertices ... - vertex_descriptor control_1 = *CGAL::cpp11::next(vb, 213); - vertex_descriptor control_2 = *CGAL::cpp11::next(vb, 157); + vertex_descriptor control_1 = *std::next(vb, 213); + vertex_descriptor control_2 = *std::next(vb, 157); // ... and insert them deform_mesh.insert_control_vertex(control_1); @@ -64,7 +64,7 @@ int main() out1 << mesh; // Add another control vertex which requires another call to preprocess - vertex_descriptor control_3 = *CGAL::cpp11::next(vb, 92); + vertex_descriptor control_3 = *std::next(vb, 92); deform_mesh.insert_control_vertex(control_3); // The prepocessing step is again needed diff --git a/Surface_mesh_deformation/examples/Surface_mesh_deformation/all_roi_assign_example_custom_polyhedron.cpp b/Surface_mesh_deformation/examples/Surface_mesh_deformation/all_roi_assign_example_custom_polyhedron.cpp index 596c48a1b5e..3624d399563 100644 --- a/Surface_mesh_deformation/examples/Surface_mesh_deformation/all_roi_assign_example_custom_polyhedron.cpp +++ b/Surface_mesh_deformation/examples/Surface_mesh_deformation/all_roi_assign_example_custom_polyhedron.cpp @@ -95,8 +95,8 @@ int main() deform_mesh.insert_roi_vertices(vb, ve); // Insert two control vertices - vertex_descriptor control_1 = *CGAL::cpp11::next(vb, 213); - vertex_descriptor control_2 = *CGAL::cpp11::next(vb, 157); + vertex_descriptor control_1 = *std::next(vb, 213); + vertex_descriptor control_2 = *std::next(vb, 157); deform_mesh.insert_control_vertex(control_1); deform_mesh.insert_control_vertex(control_2); @@ -131,7 +131,7 @@ int main() output.close(); // Add another control vertex - vertex_descriptor control_3 = *CGAL::cpp11::next(vb, 92); + vertex_descriptor control_3 = *std::next(vb, 92); deform_mesh.insert_control_vertex(control_3); // The prepocessing step is again needed diff --git a/Surface_mesh_deformation/examples/Surface_mesh_deformation/all_roi_assign_example_with_OpenMesh.cpp b/Surface_mesh_deformation/examples/Surface_mesh_deformation/all_roi_assign_example_with_OpenMesh.cpp index 46968150a56..6f81eb8522b 100644 --- a/Surface_mesh_deformation/examples/Surface_mesh_deformation/all_roi_assign_example_with_OpenMesh.cpp +++ b/Surface_mesh_deformation/examples/Surface_mesh_deformation/all_roi_assign_example_with_OpenMesh.cpp @@ -28,8 +28,8 @@ int main() deform_mesh.insert_roi_vertices(vb, ve); // Select two control vertices ... - vertex_descriptor control_1 = *CGAL::cpp11::next(vb, 213); - vertex_descriptor control_2 = *CGAL::cpp11::next(vb, 157); + vertex_descriptor control_1 = *std::next(vb, 213); + vertex_descriptor control_2 = *std::next(vb, 157); // ... and insert them deform_mesh.insert_control_vertex(control_1); @@ -64,7 +64,7 @@ int main() OpenMesh::IO::write_mesh(mesh,"deform_1.off"); // Add another control vertex which requires another call to preprocess - vertex_descriptor control_3 = *CGAL::cpp11::next(vb, 92); + vertex_descriptor control_3 = *std::next(vb, 92); deform_mesh.insert_control_vertex(control_3); // The prepocessing step is again needed diff --git a/Surface_mesh_deformation/examples/Surface_mesh_deformation/k_ring_roi_translate_rotate_Surface_mesh.cpp b/Surface_mesh_deformation/examples/Surface_mesh_deformation/k_ring_roi_translate_rotate_Surface_mesh.cpp index 3819272fd26..a4abd913dd6 100644 --- a/Surface_mesh_deformation/examples/Surface_mesh_deformation/k_ring_roi_translate_rotate_Surface_mesh.cpp +++ b/Surface_mesh_deformation/examples/Surface_mesh_deformation/k_ring_roi_translate_rotate_Surface_mesh.cpp @@ -61,12 +61,12 @@ int main() // Select and insert the vertices of the region of interest vertex_iterator vb, ve; boost::tie(vb,ve) = vertices(mesh); - std::vector roi = extract_k_ring(mesh, *CGAL::cpp11::next(vb, 47), 9); + std::vector roi = extract_k_ring(mesh, *std::next(vb, 47), 9); deform_mesh.insert_roi_vertices(roi.begin(), roi.end()); // Select and insert the control vertices - std::vector cvertices_1 = extract_k_ring(mesh, *CGAL::cpp11::next(vb, 39), 1); - std::vector cvertices_2 = extract_k_ring(mesh, *CGAL::cpp11::next(vb, 97), 1); + std::vector cvertices_1 = extract_k_ring(mesh, *std::next(vb, 39), 1); + std::vector cvertices_2 = extract_k_ring(mesh, *std::next(vb, 97), 1); deform_mesh.insert_control_vertices(cvertices_1.begin(), cvertices_1.end()); deform_mesh.insert_control_vertices(cvertices_2.begin(), cvertices_2.end()); diff --git a/Surface_mesh_deformation/examples/Surface_mesh_deformation/k_ring_roi_translate_rotate_example.cpp b/Surface_mesh_deformation/examples/Surface_mesh_deformation/k_ring_roi_translate_rotate_example.cpp index c87249d2ea2..00a34aeafb5 100644 --- a/Surface_mesh_deformation/examples/Surface_mesh_deformation/k_ring_roi_translate_rotate_example.cpp +++ b/Surface_mesh_deformation/examples/Surface_mesh_deformation/k_ring_roi_translate_rotate_example.cpp @@ -66,12 +66,12 @@ int main() // Select and insert the vertices of the region of interest vertex_iterator vb, ve; boost::tie(vb,ve) = vertices(mesh); - std::vector roi = extract_k_ring(mesh, *CGAL::cpp11::next(vb, 47), 9); + std::vector roi = extract_k_ring(mesh, *std::next(vb, 47), 9); deform_mesh.insert_roi_vertices(roi.begin(), roi.end()); // Select and insert the control vertices - std::vector cvertices_1 = extract_k_ring(mesh, *CGAL::cpp11::next(vb, 39), 1); - std::vector cvertices_2 = extract_k_ring(mesh, *CGAL::cpp11::next(vb, 97), 1); + std::vector cvertices_1 = extract_k_ring(mesh, *std::next(vb, 39), 1); + std::vector cvertices_2 = extract_k_ring(mesh, *std::next(vb, 97), 1); deform_mesh.insert_control_vertices(cvertices_1.begin(), cvertices_1.end()); deform_mesh.insert_control_vertices(cvertices_2.begin(), cvertices_2.end()); diff --git a/Surface_mesh_simplification/include/CGAL/Surface_mesh_simplification/Detail/Edge_collapse_impl.h b/Surface_mesh_simplification/include/CGAL/Surface_mesh_simplification/Detail/Edge_collapse_impl.h index 964bbc367e2..f47d3d752f5 100644 --- a/Surface_mesh_simplification/include/CGAL/Surface_mesh_simplification/Detail/Edge_collapse_impl.h +++ b/Surface_mesh_simplification/include/CGAL/Surface_mesh_simplification/Detail/Edge_collapse_impl.h @@ -675,12 +675,12 @@ bool EdgeCollapse::Is_collapse_geometrically_vali typedef typename Profile::vertex_descriptor_vector::const_iterator link_iterator ; link_iterator linkb = aProfile.link().begin(); link_iterator linke = aProfile.link().end (); - link_iterator linkl = cpp11::prev(linke) ; + link_iterator linkl = std::prev(linke) ; for ( link_iterator l = linkb ; l != linke && rR ; ++ l ) { - link_iterator pv = ( l == linkb ? linkl : cpp11::prev (l) ); - link_iterator nx = ( l == linkl ? linkb : cpp11::next (l) ) ; + link_iterator pv = ( l == linkb ? linkl : std::prev (l) ); + link_iterator nx = ( l == linkl ? linkb : std::next (l) ) ; // k0,k1 and k3 are three consecutive vertices along the link. vertex_descriptor k1 = *pv ; diff --git a/Triangulation/benchmark/Triangulation/delaunay.cpp b/Triangulation/benchmark/Triangulation/delaunay.cpp index acf913d56f8..af9b505b37a 100644 --- a/Triangulation/benchmark/Triangulation/delaunay.cpp +++ b/Triangulation/benchmark/Triangulation/delaunay.cpp @@ -47,7 +47,7 @@ std::size_t compute_triangulation(std::size_t N) std::vector points; CGAL::Random rng; Random_points_iterator rand_it(D, 2.0, rng); - CGAL::cpp11::copy_n(rand_it, N, std::back_inserter(points)); + std::copy_n(rand_it, N, std::back_inserter(points)); #ifdef EXPORT_POINTS_TO_A_FILE std::ofstream os("points.txt"); diff --git a/Triangulation/examples/Triangulation/convex_hull.cpp b/Triangulation/examples/Triangulation/convex_hull.cpp index af042573c4d..61d8e50fdcd 100644 --- a/Triangulation/examples/Triangulation/convex_hull.cpp +++ b/Triangulation/examples/Triangulation/convex_hull.cpp @@ -25,7 +25,7 @@ int main(int argc, char **argv) typedef CGAL::Random_points_in_cube_d Random_points_iterator; Random_points_iterator rand_it(D, 1.0, CGAL::get_default_random()); std::vector points; - CGAL::cpp11::copy_n(rand_it, N, std::back_inserter(points)); + std::copy_n(rand_it, N, std::back_inserter(points)); T t(D); CGAL_assertion(t.empty()); diff --git a/Triangulation/examples/Triangulation/triangulation.cpp b/Triangulation/examples/Triangulation/triangulation.cpp index 06420697921..7728f82c2f7 100644 --- a/Triangulation/examples/Triangulation/triangulation.cpp +++ b/Triangulation/examples/Triangulation/triangulation.cpp @@ -28,7 +28,7 @@ int main() // - - - - - - - - - - - - - - - - - - - - - - - - STEP 1 CGAL::Random_points_in_cube_d rand_it(D, 1.0); std::vector points; - CGAL::cpp11::copy_n(rand_it, N, std::back_inserter(points)); + std::copy_n(rand_it, N, std::back_inserter(points)); Triangulation t(D); // create triangulation CGAL_assertion(t.empty()); diff --git a/Triangulation/test/Triangulation/test_delaunay.cpp b/Triangulation/test/Triangulation/test_delaunay.cpp index 8ba85a3d84d..bf6b38ff7ab 100644 --- a/Triangulation/test/Triangulation/test_delaunay.cpp +++ b/Triangulation/test/Triangulation/test_delaunay.cpp @@ -40,7 +40,7 @@ void test(const int d, const string & type, const int N) vector points; //CGAL::Random rng; //Random_points_iterator rand_it(d, 2.0, rng); - //CGAL::cpp11::copy_n(rand_it, N, back_inserter(points)); + //std::copy_n(rand_it, N, back_inserter(points)); srand(10); for( int i = 0; i < N; ++i ) diff --git a/Triangulation/test/Triangulation/test_triangulation.cpp b/Triangulation/test/Triangulation/test_triangulation.cpp index 1f9a8b5c8a2..eb5f0835bd2 100644 --- a/Triangulation/test/Triangulation/test_triangulation.cpp +++ b/Triangulation/test/Triangulation/test_triangulation.cpp @@ -43,7 +43,7 @@ void test(const int d, const string & type, int N) vector points; CGAL::Random rng; Random_points_iterator rand_it(d, 1.0, rng); - CGAL::cpp11::copy_n(rand_it, N, std::back_inserter(points)); + std::copy_n(rand_it, N, std::back_inserter(points)); cerr << '\n' << points.size() << " points in the grid."; diff --git a/Triangulation_2/benchmark/Triangulation_2/CDT_with_intersection_2.cpp b/Triangulation_2/benchmark/Triangulation_2/CDT_with_intersection_2.cpp index c4bd24a23b3..52929e45930 100644 --- a/Triangulation_2/benchmark/Triangulation_2/CDT_with_intersection_2.cpp +++ b/Triangulation_2/benchmark/Triangulation_2/CDT_with_intersection_2.cpp @@ -36,7 +36,7 @@ int main(int argc,char** argv ) std::vector point_set; point_set.reserve(2*n_segments); - CGAL::cpp11::copy_n(Point_generator(1,rand), 2*n_segments,std::back_inserter(point_set)); + std::copy_n(Point_generator(1,rand), 2*n_segments,std::back_inserter(point_set)); std::cout << point_set.size()/2 << " segments" << std::endl; diff --git a/Triangulation_2/examples/Triangulation_2/copy_triangulation_2.cpp b/Triangulation_2/examples/Triangulation_2/copy_triangulation_2.cpp index 78d8f2db682..8ad2e510d6e 100644 --- a/Triangulation_2/examples/Triangulation_2/copy_triangulation_2.cpp +++ b/Triangulation_2/examples/Triangulation_2/copy_triangulation_2.cpp @@ -36,7 +36,7 @@ int main() { std::vector< EPIC::Point_2> points; CGAL::Random_points_in_disc_2 g(1.0); - CGAL::cpp11::copy_n( g, 600, std::back_inserter(points) ); + std::copy_n( g, 600, std::back_inserter(points) ); DT2_epic dt2_epic; dt2_epic.insert(points.begin(), points.end()); diff --git a/Triangulation_2/examples/Triangulation_2/hierarchy.cpp b/Triangulation_2/examples/Triangulation_2/hierarchy.cpp index 2d30581216c..6f7c5817e32 100644 --- a/Triangulation_2/examples/Triangulation_2/hierarchy.cpp +++ b/Triangulation_2/examples/Triangulation_2/hierarchy.cpp @@ -21,7 +21,7 @@ int main( ) std::cout << "insertion of 1000 random points" << std::endl; Triangulation t; CGAL::Random_points_in_square_2 g(1.); - CGAL::cpp11::copy_n( g, 1000, std::back_inserter(t)); + std::copy_n( g, 1000, std::back_inserter(t)); //verbose mode of is_valid ; shows the number of vertices at each level std::cout << "The number of vertices at successive levels" << std::endl; diff --git a/Triangulation_2/test/Triangulation_2/include/CGAL/_test_cls_delaunay_hierarchy_2.h b/Triangulation_2/test/Triangulation_2/include/CGAL/_test_cls_delaunay_hierarchy_2.h index bedea5d2a27..3936425d02e 100644 --- a/Triangulation_2/test/Triangulation_2/include/CGAL/_test_cls_delaunay_hierarchy_2.h +++ b/Triangulation_2/test/Triangulation_2/include/CGAL/_test_cls_delaunay_hierarchy_2.h @@ -40,7 +40,7 @@ _test_cls_delaunay_hierarchy_2( const Dh & ) std::cout << " insertion removal of 1000 points" << std::endl; Delaunay_hierarchy dh; CGAL::Random_points_in_square_2 g(1.); - CGAL::cpp11::copy_n( g, 1000, std::back_inserter(dh)); + std::copy_n( g, 1000, std::back_inserter(dh)); dh.locate(Point(0.,0.)); diff --git a/Triangulation_3/benchmark/Triangulation_3/simple_2.cpp b/Triangulation_3/benchmark/Triangulation_3/simple_2.cpp index 92fcfe7d0fb..68d9e4a7d2c 100644 --- a/Triangulation_3/benchmark/Triangulation_3/simple_2.cpp +++ b/Triangulation_3/benchmark/Triangulation_3/simple_2.cpp @@ -19,7 +19,7 @@ int main(int,char** argv) CGAL::Random rng(0); CGAL::Random_points_in_sphere_3 g( 1,rng); - CGAL::cpp11::copy_n( g, n, std::back_inserter(points)); + std::copy_n( g, n, std::back_inserter(points)); Timer timer; timer.start(); diff --git a/Triangulation_3/demo/Triangulation_3/Scene.cpp b/Triangulation_3/demo/Triangulation_3/Scene.cpp index d566b020512..ab6367885cf 100644 --- a/Triangulation_3/demo/Triangulation_3/Scene.cpp +++ b/Triangulation_3/demo/Triangulation_3/Scene.cpp @@ -29,7 +29,7 @@ void Scene::generatePoints(int num) /* Insert them into the point list: */ /* 1. use CGAL's copy function --tested */ list pts; - CGAL::cpp11::copy_n( pts_generator, num, std::back_inserter(pts) ); + std::copy_n( pts_generator, num, std::back_inserter(pts) ); /* 2. use STL's function */ //for (int i=0; im_dt.number_of_vertices() == 0 ) { CGAL::Random_points_in_cube_3 pts_generator(1.0); - CGAL::cpp11::copy_n( pts_generator, 100, std::back_inserter(m_incrementalPts) ); + std::copy_n( pts_generator, 100, std::back_inserter(m_incrementalPts) ); } else { for(QList::iterator vit = m_pScene->m_vhArray.begin(); vit < m_pScene->m_vhArray.end(); ++vit) { diff --git a/Triangulation_3/examples/Triangulation_3/copy_triangulation_3.cpp b/Triangulation_3/examples/Triangulation_3/copy_triangulation_3.cpp index ffe7b0b4b07..d441d23dc4c 100644 --- a/Triangulation_3/examples/Triangulation_3/copy_triangulation_3.cpp +++ b/Triangulation_3/examples/Triangulation_3/copy_triangulation_3.cpp @@ -36,7 +36,7 @@ int main() { std::vector< EPIC::Point_3> points; CGAL::Random_points_in_sphere_3 g(1.0); - CGAL::cpp11::copy_n( g, 600, std::back_inserter(points) ); + std::copy_n( g, 600, std::back_inserter(points) ); DT3_epic dt3_epic(points.begin(), points.end()); DT3_epec dt3_epec; diff --git a/Triangulation_3/examples/Triangulation_3/draw_triangulation_3.cpp b/Triangulation_3/examples/Triangulation_3/draw_triangulation_3.cpp index 3806854f938..b8e63967210 100644 --- a/Triangulation_3/examples/Triangulation_3/draw_triangulation_3.cpp +++ b/Triangulation_3/examples/Triangulation_3/draw_triangulation_3.cpp @@ -11,7 +11,7 @@ int main() { std::vector points; CGAL::Random_points_in_sphere_3 g(1.0); - CGAL::cpp11::copy_n(g, 50, std::back_inserter(points)); + std::copy_n(g, 50, std::back_inserter(points)); DT3 dt3(points.begin(), points.end());