From f62624c4f97a6b11cd5d79f7d320ec053dd2452e Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?S=C3=A9bastien=20Loriot?= Date: Wed, 20 Mar 2019 09:52:59 +0100 Subject: [PATCH] replace cpp11::tuple by std::tuple --- Alpha_shapes_3/include/CGAL/Alpha_shape_3.h | 4 +- .../CGAL/Linear_cell_complex_bgl_min_items.h | 2 +- .../demo/CGAL_ipelets/arrangement.cpp | 10 +- .../include/CGAL/CGAL_Ipelet_base_v6.h | 42 ++-- .../include/CGAL/CGAL_Ipelet_base_v7.h | 42 ++-- .../CGAL/Combinatorial_map.h | 2 +- .../CGAL/Combinatorial_map_min_items.h | 2 +- .../Combinatorial_map/Combinatorial_map.txt | 2 +- .../Concepts/GenericMapItems.h | 2 +- .../map_3_dynamic_onmerge.cpp | 2 +- .../map_3_with_colored_facets.cpp | 2 +- .../include/CGAL/Combinatorial_map.h | 22 +- .../CGAL/Combinatorial_map_min_items.h | 2 +- .../include/CGAL/Combinatorial_map_storages.h | 10 +- Combinatorial_map/include/CGAL/Dart.h | 8 +- .../Combinatorial_map_copy_functors.h | 2 +- .../Combinatorial_map_internal_functors.h | 12 +- .../CGAL/internal/Combinatorial_map_utility.h | 104 ++++----- .../Combinatorial_map_copy_test.cpp | 18 +- .../Combinatorial_map_deprecated_test.cpp | 2 +- .../Combinatorial_map_test.cpp | 14 +- .../Convex_hull_2/ch_akl_toussaint_impl.h | 44 ++-- .../Generalized_map/CGAL/Generalized_map.h | 2 +- .../doc/Generalized_map/Generalized_map.txt | 2 +- .../gmap_3_dynamic_onmerge.cpp | 2 +- .../gmap_3_with_colored_facets.cpp | 2 +- .../include/CGAL/Generalized_map.h | 22 +- .../include/CGAL/Generalized_map_storages.h | 10 +- .../Generalized_map/Generalized_map_test.cpp | 12 +- .../Intersections_2/variant_any_object.cpp | 14 +- .../examples/Kernel_23/intersections.cpp | 2 +- .../Linear_cell_complex_2/lcc_performance_2.h | 4 +- .../Linear_cell_complex_3/lcc_performance_3.h | 4 +- .../demo/Linear_cell_complex/typedefs.h | 2 +- .../CGAL/Linear_cell_complex_min_items.h | 2 +- ...r_cell_complex_3_with_colored_vertices.cpp | 2 +- .../CGAL/CMap_linear_cell_complex_storages.h | 10 +- .../CGAL/GMap_linear_cell_complex_storages.h | 10 +- .../CGAL/Linear_cell_complex_bgl_min_items.h | 2 +- .../CGAL/Linear_cell_complex_min_items.h | 4 +- .../Linear_cell_complex_2_test.cpp | 4 +- .../Linear_cell_complex_3_test.cpp | 4 +- .../Linear_cell_complex_4_test.cpp | 4 +- .../Linear_cell_complex_copy_test.cpp | 18 +- .../CGAL/Constrained_voronoi_diagram_2.h | 4 +- Mesh_3/archive/applications/lanteri_utils.h | 4 +- .../Concepts/MeshDomainWithFeatures_3.h | 2 +- Mesh_3/doc/Mesh_3/Concepts/MeshDomain_3.h | 2 +- .../Mesh_3/mesh_hybrid_mesh_domain.cpp | 2 +- Mesh_3/include/CGAL/Labeled_mesh_domain_3.h | 4 +- Mesh_3/include/CGAL/Mesh_3/C3T3_helpers.h | 12 +- .../CGAL/Mesh_3/Mesh_global_optimizer.h | 20 +- .../CGAL/Mesh_3/Protect_edges_sizing_field.h | 12 +- Mesh_3/include/CGAL/Mesh_3/Refine_facets_3.h | 88 ++++---- ...tialize_triangulation_from_labeled_image.h | 6 +- .../CGAL/Mesh_3/polylines_to_protect.h | 4 +- .../Mesh_domain_with_polyline_features_3.h | 4 +- .../include/CGAL/Polyhedral_mesh_domain_3.h | 8 +- .../test_domain_with_polyline_features.cpp | 8 +- .../Mesh_3/test_labeled_mesh_domain_3.cpp | 30 +-- .../CGAL/NewKernel_d/Kernel_2_interface.h | 2 +- .../CGAL/NewKernel_d/Kernel_3_interface.h | 4 +- NewKernel_d/include/CGAL/NewKernel_d/utils.h | 6 +- .../Optimal_transportation_reconstruction_2.h | 4 +- .../Protect_edges_sizing_field.h | 12 +- .../read_ply_points_with_colors_example.cpp | 2 +- .../write_ply_points_example.cpp | 4 +- ...refinement_mesh_union_and_intersection.cpp | 2 +- .../hole_filling_example.cpp | 2 +- .../hole_filling_example_LCC.cpp | 2 +- .../hole_filling_example_OM.cpp | 2 +- .../hole_filling_example_SM.cpp | 2 +- .../Polygon_mesh_processing/corefinement.h | 58 ++--- .../Corefinement/Face_graph_output_builder.h | 36 ++-- .../intersect_triangle_and_segment_3.h | 8 +- .../internal/Corefinement/intersection_impl.h | 32 +-- .../orient_polygon_soup.h | 8 +- .../CGAL/Polygon_mesh_processing/repair.h | 2 +- .../Polygon_mesh_processing/stitch_borders.h | 2 +- .../triangulate_hole.h | 6 +- .../include/CGAL/Polygon_mesh_slicer.h | 8 +- .../test_corefinement_and_constraints.cpp | 2 +- .../Plugins/PMP/Hole_filling_plugin.cpp | 4 +- .../Plugins/PMP/Orient_soup_plugin.cpp | 4 +- Polyhedron_IO/include/CGAL/IO/PLY_reader.h | 4 +- Property_map/include/CGAL/property_map.h | 2 +- .../doc/STL_Extension/CGAL/iterator.h | 8 +- STL_Extension/doc/STL_Extension/CGAL/tuple.h | 43 ---- .../doc/STL_Extension/CGAL/utility.h | 4 +- .../Dispatch_output_iterator.cpp | 10 +- STL_Extension/include/CGAL/iterator.h | 44 ++-- STL_Extension/include/CGAL/tuple.h | 201 +----------------- STL_Extension/include/CGAL/utility.h | 2 +- .../STL_Extension/test_dispatch_output.cpp | 22 +- .../test/STL_Extension/test_namespaces.cpp | 2 +- .../test/STL_Extension/test_stl_extension.cpp | 36 ++-- .../Voronoi_vertex_ring_C2.h | 16 +- .../include/CGAL/Side_of_bounded_square_2.h | 54 ++--- .../Orthogonal_incremental_neighbor_search.h | 20 +- Surface_mesh/benchmark/lcc_performance_2.h | 4 +- .../include/CGAL/Surface_mesh_deformation.h | 26 +-- .../Cactus_deformation_session_OpenMesh.cpp | 4 +- .../include/CGAL/Delaunay_triangulation.h | 12 +- .../include/CGAL/Regular_triangulation.h | 12 +- Triangulation/include/CGAL/Triangulation.h | 14 +- 105 files changed, 608 insertions(+), 844 deletions(-) delete mode 100644 STL_Extension/doc/STL_Extension/CGAL/tuple.h diff --git a/Alpha_shapes_3/include/CGAL/Alpha_shape_3.h b/Alpha_shapes_3/include/CGAL/Alpha_shape_3.h index a9a209886d9..a2d5dc0df3d 100644 --- a/Alpha_shapes_3/include/CGAL/Alpha_shape_3.h +++ b/Alpha_shapes_3/include/CGAL/Alpha_shape_3.h @@ -979,8 +979,8 @@ public: template OutputIterator filtration(OutputIterator it) const { - Dispatch_or_drop_output_iterator, cpp11::tuple > out(it); - return cpp11::template get<0>( filtration_with_alpha_values(out) ); + Dispatch_or_drop_output_iterator, std::tuple > out(it); + return std::template get<0>( filtration_with_alpha_values(out) ); } private: diff --git a/BGL/doc/BGL/CGAL/Linear_cell_complex_bgl_min_items.h b/BGL/doc/BGL/CGAL/Linear_cell_complex_bgl_min_items.h index 2d4f9c7d7f1..d340982eec0 100644 --- a/BGL/doc/BGL/CGAL/Linear_cell_complex_bgl_min_items.h +++ b/BGL/doc/BGL/CGAL/Linear_cell_complex_bgl_min_items.h @@ -22,7 +22,7 @@ struct Linear_cell_complex_bgl_min_items typedef CGAL::Tag_true Darts_with_id; typedef CGAL::Cell_attribute_with_point_and_id Vertex_attrib; typedef CGAL::Cell_attribute_with_id Face_attrib; - typedef CGAL::cpp11::tuple Attributes; + typedef std::tuple Attributes; }; }; diff --git a/CGAL_ipelets/demo/CGAL_ipelets/arrangement.cpp b/CGAL_ipelets/demo/CGAL_ipelets/arrangement.cpp index db7bb998fc0..76eaa144616 100644 --- a/CGAL_ipelets/demo/CGAL_ipelets/arrangement.cpp +++ b/CGAL_ipelets/demo/CGAL_ipelets/arrangement.cpp @@ -96,11 +96,11 @@ void ArrPolyIpelet::protected_run(int fn){ for (std::list::iterator it=arc_list.begin();it!=arc_list.end();++it) input_curves.push_back( - Curve_2( CGAL::cpp11::get<0>(*it).center(), - sqrt(CGAL::to_double(CGAL::cpp11::get<0>(*it).squared_radius())), - CGAL::cpp11::get<3>(*it), - Traits::Point_2(CGAL::cpp11::get<1>(*it).x(),CGAL::cpp11::get<1>(*it).y()), - Traits::Point_2(CGAL::cpp11::get<2>(*it).x(),CGAL::cpp11::get<2>(*it).y()) + Curve_2( std::get<0>(*it).center(), + sqrt(CGAL::to_double(std::get<0>(*it).squared_radius())), + std::get<3>(*it), + Traits::Point_2(std::get<1>(*it).x(),std::get<1>(*it).y()), + Traits::Point_2(std::get<2>(*it).x(),std::get<2>(*it).y()) ) ); diff --git a/CGAL_ipelets/include/CGAL/CGAL_Ipelet_base_v6.h b/CGAL_ipelets/include/CGAL/CGAL_Ipelet_base_v6.h index 1eb814c208f..027a83bc6c0 100644 --- a/CGAL_ipelets/include/CGAL/CGAL_Ipelet_base_v6.h +++ b/CGAL_ipelets/include/CGAL/CGAL_Ipelet_base_v6.h @@ -67,7 +67,7 @@ namespace CGAL{ typedef typename CGAL::Polygon_2 Polygon_2; typedef typename Kernel::Circle_2 Circle_2; - typedef CGAL::cpp11::tuple Circular_arc_2; + typedef std::tuple Circular_arc_2; Ipelet_base(const std::string NameS,const std::string SubLabS[],const std::string HMsgS[]) @@ -411,15 +411,15 @@ public: draw_in_ipe(const Circular_arc_2& arc,bool deselect_all=false) const { IpeSegmentSubPath* SSP_ipe = new IpeSegmentSubPath; - IpeVector ipeS=IpeVector( CGAL::to_double(CGAL::cpp11::get<1>(arc).x()), - CGAL::to_double(CGAL::cpp11::get<1>(arc).y()));//convert ot ipe format - IpeVector ipeT=IpeVector( CGAL::to_double(CGAL::cpp11::get<2>(arc).x()), - CGAL::to_double(CGAL::cpp11::get<2>(arc).y()));//convert ot ipe format - SSP_ipe->AppendArc(IpeMatrix(sqrt(CGAL::to_double(CGAL::cpp11::get<0>(arc).squared_radius())),0, - 0,(CGAL::cpp11::get<3>(arc)==CGAL::COUNTERCLOCKWISE?1:-1)* - sqrt(CGAL::to_double(CGAL::cpp11::get<0>(arc).squared_radius())), - CGAL::to_double(CGAL::cpp11::get<0>(arc).center().x()), - CGAL::to_double(CGAL::cpp11::get<0>(arc).center().y())), + IpeVector ipeS=IpeVector( CGAL::to_double(std::get<1>(arc).x()), + CGAL::to_double(std::get<1>(arc).y()));//convert ot ipe format + IpeVector ipeT=IpeVector( CGAL::to_double(std::get<2>(arc).x()), + CGAL::to_double(std::get<2>(arc).y()));//convert ot ipe format + SSP_ipe->AppendArc(IpeMatrix(sqrt(CGAL::to_double(std::get<0>(arc).squared_radius())),0, + 0,(std::get<3>(arc)==CGAL::COUNTERCLOCKWISE?1:-1)* + sqrt(CGAL::to_double(std::get<0>(arc).squared_radius())), + CGAL::to_double(std::get<0>(arc).center().x()), + CGAL::to_double(std::get<0>(arc).center().y())), ipeS,ipeT); IpePath* obj_ipe = new IpePath(_helper->Attributes()); obj_ipe->AddSubPath(SSP_ipe); @@ -482,17 +482,17 @@ public: draw_in_ipe(const Circular_arc_2& object,const Iso_rectangle_2& bbox,bool deselect_all=false) const { std::vector arc_list; - const Circle_2& circle=CGAL::cpp11::get<0>(object); + const Circle_2& circle=std::get<0>(object); restrict_circle_to_bbox(circle,bbox,std::back_inserter(arc_list)); if (arc_list.empty() && bbox.has_on_bounded_side(circle.center()) ){ draw_in_ipe(object,deselect_all); return; } - const Point_2* source=(CGAL::cpp11::get<3>(object)==CGAL::COUNTERCLOCKWISE)? - &CGAL::cpp11::get<1>(object):&CGAL::cpp11::get<2>(object); - const Point_2* target=(CGAL::cpp11::get<3>(object)==CGAL::COUNTERCLOCKWISE)? - &CGAL::cpp11::get<2>(object):&CGAL::cpp11::get<1>(object); + const Point_2* source=(std::get<3>(object)==CGAL::COUNTERCLOCKWISE)? + &std::get<1>(object):&std::get<2>(object); + const Point_2* target=(std::get<3>(object)==CGAL::COUNTERCLOCKWISE)? + &std::get<2>(object):&std::get<1>(object); std::multimap > map_theta; typedef typename std::multimap >::iterator Map_theta_iterator; Map_theta_iterator s_it=map_theta.insert( @@ -501,10 +501,10 @@ public: std::make_pair(get_theta(*target,circle),std::make_pair(OTRG,target))); for (typename std::vector::iterator it_arc=arc_list.begin();it_arc!=arc_list.end();++it_arc){ - const Point_2* arc_s=(CGAL::cpp11::get<3>(*it_arc)==CGAL::COUNTERCLOCKWISE)? - &CGAL::cpp11::get<1>(*it_arc):&CGAL::cpp11::get<2>(*it_arc); - const Point_2* arc_t=(CGAL::cpp11::get<3>(*it_arc)==CGAL::COUNTERCLOCKWISE)? - &CGAL::cpp11::get<2>(*it_arc):&CGAL::cpp11::get<1>(*it_arc); + const Point_2* arc_s=(std::get<3>(*it_arc)==CGAL::COUNTERCLOCKWISE)? + &std::get<1>(*it_arc):&std::get<2>(*it_arc); + const Point_2* arc_t=(std::get<3>(*it_arc)==CGAL::COUNTERCLOCKWISE)? + &std::get<2>(*it_arc):&std::get<1>(*it_arc); map_theta.insert( std::make_pair(get_theta(*arc_s,circle),std::make_pair(SRC,arc_s) ) ); map_theta.insert( std::make_pair(get_theta(*arc_t,circle),std::make_pair(TRG,arc_t) ) ); } @@ -773,9 +773,9 @@ public: Circle_2 approx_circle=conv(exact_circle); if (!sign_known){ CGAL::Sign sign = (CGAL::orientation(sd,td,center)==CGAL::LEFT_TURN)?CGAL::POSITIVE:CGAL::NEGATIVE; - return CGAL::cpp11::make_tuple(approx_circle,sd,td,sign); + return std::make_tuple(approx_circle,sd,td,sign); } - return CGAL::cpp11::make_tuple(approx_circle,sd,td,CGAL::POSITIVE); + return std::make_tuple(approx_circle,sd,td,CGAL::POSITIVE); } void diff --git a/CGAL_ipelets/include/CGAL/CGAL_Ipelet_base_v7.h b/CGAL_ipelets/include/CGAL/CGAL_Ipelet_base_v7.h index 37562338996..22ec39cbff4 100644 --- a/CGAL_ipelets/include/CGAL/CGAL_Ipelet_base_v7.h +++ b/CGAL_ipelets/include/CGAL/CGAL_Ipelet_base_v7.h @@ -103,7 +103,7 @@ namespace CGAL{ typedef CGAL::Polygon_2 Polygon_2; typedef typename Kernel::Circle_2 Circle_2; - typedef CGAL::cpp11::tuple Circular_arc_2; + typedef std::tuple Circular_arc_2; Ipelet_base(const std::string NameS,const std::string SubLabS[],const std::string HMsgS[]) @@ -422,15 +422,15 @@ public: draw_in_ipe(const Circular_arc_2& arc,bool deselect_all=false) const { ipe::Curve* SSP_ipe = new ipe::Curve; - ipe::Vector ipeS=ipe::Vector( CGAL::to_double(CGAL::cpp11::get<1>(arc).x()), - CGAL::to_double(CGAL::cpp11::get<1>(arc).y()));//convert ot ipe format - ipe::Vector ipeT=ipe::Vector( CGAL::to_double(CGAL::cpp11::get<2>(arc).x()), - CGAL::to_double(CGAL::cpp11::get<2>(arc).y()));//convert ot ipe format - SSP_ipe->appendArc(ipe::Matrix(sqrt(CGAL::to_double(CGAL::cpp11::get<0>(arc).squared_radius())),0, - 0,(CGAL::cpp11::get<3>(arc)==CGAL::COUNTERCLOCKWISE?1:-1)* - sqrt(CGAL::to_double(CGAL::cpp11::get<0>(arc).squared_radius())), - CGAL::to_double(CGAL::cpp11::get<0>(arc).center().x()), - CGAL::to_double(CGAL::cpp11::get<0>(arc).center().y())), + ipe::Vector ipeS=ipe::Vector( CGAL::to_double(std::get<1>(arc).x()), + CGAL::to_double(std::get<1>(arc).y()));//convert ot ipe format + ipe::Vector ipeT=ipe::Vector( CGAL::to_double(std::get<2>(arc).x()), + CGAL::to_double(std::get<2>(arc).y()));//convert ot ipe format + SSP_ipe->appendArc(ipe::Matrix(sqrt(CGAL::to_double(std::get<0>(arc).squared_radius())),0, + 0,(std::get<3>(arc)==CGAL::COUNTERCLOCKWISE?1:-1)* + sqrt(CGAL::to_double(std::get<0>(arc).squared_radius())), + CGAL::to_double(std::get<0>(arc).center().x()), + CGAL::to_double(std::get<0>(arc).center().y())), ipeS,ipeT); ipe::Shape shape; shape.appendSubPath(SSP_ipe); @@ -490,17 +490,17 @@ public: draw_in_ipe(const Circular_arc_2& object,const Iso_rectangle_2& bbox,bool deselect_all=false) const { std::vector arc_list; - const Circle_2& circle=CGAL::cpp11::get<0>(object); + const Circle_2& circle=std::get<0>(object); restrict_circle_to_bbox(circle,bbox,std::back_inserter(arc_list)); if (arc_list.empty() && bbox.has_on_bounded_side(circle.center()) ){ draw_in_ipe(object,deselect_all); return; } - const Point_2* source=(CGAL::cpp11::get<3>(object)==CGAL::COUNTERCLOCKWISE)? - &CGAL::cpp11::get<1>(object):&CGAL::cpp11::get<2>(object); - const Point_2* target=(CGAL::cpp11::get<3>(object)==CGAL::COUNTERCLOCKWISE)? - &CGAL::cpp11::get<2>(object):&CGAL::cpp11::get<1>(object); + const Point_2* source=(std::get<3>(object)==CGAL::COUNTERCLOCKWISE)? + &std::get<1>(object):&std::get<2>(object); + const Point_2* target=(std::get<3>(object)==CGAL::COUNTERCLOCKWISE)? + &std::get<2>(object):&std::get<1>(object); std::multimap > map_theta; typedef typename std::multimap >::iterator Map_theta_iterator; Map_theta_iterator s_it=map_theta.insert( @@ -510,10 +510,10 @@ public: std::make_pair(get_theta(*target,circle),std::make_pair(OTRG,target))); for (typename std::vector::iterator it_arc=arc_list.begin();it_arc!=arc_list.end();++it_arc){ - const Point_2* arc_s=(CGAL::cpp11::get<3>(*it_arc)==CGAL::COUNTERCLOCKWISE)? - &CGAL::cpp11::get<1>(*it_arc):&CGAL::cpp11::get<2>(*it_arc); - const Point_2* arc_t=(CGAL::cpp11::get<3>(*it_arc)==CGAL::COUNTERCLOCKWISE)? - &CGAL::cpp11::get<2>(*it_arc):&CGAL::cpp11::get<1>(*it_arc); + const Point_2* arc_s=(std::get<3>(*it_arc)==CGAL::COUNTERCLOCKWISE)? + &std::get<1>(*it_arc):&std::get<2>(*it_arc); + const Point_2* arc_t=(std::get<3>(*it_arc)==CGAL::COUNTERCLOCKWISE)? + &std::get<2>(*it_arc):&std::get<1>(*it_arc); map_theta.insert( std::make_pair(get_theta(*arc_s,circle),std::make_pair(SRC,arc_s) ) ); map_theta.insert( std::make_pair(get_theta(*arc_t,circle),std::make_pair(TRG,arc_t) ) ); } @@ -779,9 +779,9 @@ public: Circle_2 approx_circle=conv(exact_circle); if (!sign_known){ CGAL::Sign sign = (CGAL::orientation(sd,td,center)==CGAL::LEFT_TURN)?CGAL::POSITIVE:CGAL::NEGATIVE; - return CGAL::cpp11::make_tuple(approx_circle,sd,td,sign); + return std::make_tuple(approx_circle,sd,td,sign); } - return CGAL::cpp11::make_tuple(approx_circle,sd,td,CGAL::POSITIVE); + return std::make_tuple(approx_circle,sd,td,CGAL::POSITIVE); } void diff --git a/Combinatorial_map/doc/Combinatorial_map/CGAL/Combinatorial_map.h b/Combinatorial_map/doc/Combinatorial_map/CGAL/Combinatorial_map.h index 084d951d88b..c7175837df6 100644 --- a/Combinatorial_map/doc/Combinatorial_map/CGAL/Combinatorial_map.h +++ b/Combinatorial_map/doc/Combinatorial_map/CGAL/Combinatorial_map.h @@ -65,7 +65,7 @@ Information associated with darts. Equal to `void` if `Dart_info` is not defined typedef Items::Dart_wrapper::Dart_info Dart_info; /*! -The tuple of cell attributes. Equal to `CGAL::cpp11::tuple<>` if `Attributes` is not defined in the items class. +The tuple of cell attributes. Equal to `std::tuple<>` if `Attributes` is not defined in the items class. */ typedef Items::Dart_wrapper::Attributes Attributes; diff --git a/Combinatorial_map/doc/Combinatorial_map/CGAL/Combinatorial_map_min_items.h b/Combinatorial_map/doc/Combinatorial_map/CGAL/Combinatorial_map_min_items.h index f00a5ee1d9d..57251b9b555 100644 --- a/Combinatorial_map/doc/Combinatorial_map/CGAL/Combinatorial_map_min_items.h +++ b/Combinatorial_map/doc/Combinatorial_map/CGAL/Combinatorial_map_min_items.h @@ -22,7 +22,7 @@ struct Combinatorial_map_min_items struct Dart_wrapper { typedef CGAL::Dart Dart; - typedef CGAL::cpp11::tuple<> Attributes; + typedef std::tuple<> Attributes; }; }; \endcode diff --git a/Combinatorial_map/doc/Combinatorial_map/Combinatorial_map.txt b/Combinatorial_map/doc/Combinatorial_map/Combinatorial_map.txt index 0ea4f517a5c..31a7ba36d91 100644 --- a/Combinatorial_map/doc/Combinatorial_map/Combinatorial_map.txt +++ b/Combinatorial_map/doc/Combinatorial_map/Combinatorial_map.txt @@ -221,7 +221,7 @@ struct Example_items_3 { typedef double Dart_info; typedef CGAL::Cell_attribute Edge_attrib; - typedef CGAL::cpp11::tuple Attributes; + typedef std::tuple Attributes; }; }; typedef CGAL::Combinatorial_map<3, Example_items_3> Example_custom_cmap3; diff --git a/Combinatorial_map/doc/Combinatorial_map/Concepts/GenericMapItems.h b/Combinatorial_map/doc/Combinatorial_map/Concepts/GenericMapItems.h index 9eda140a162..c84d30dc7e4 100644 --- a/Combinatorial_map/doc/Combinatorial_map/Concepts/GenericMapItems.h +++ b/Combinatorial_map/doc/Combinatorial_map/Concepts/GenericMapItems.h @@ -28,7 +28,7 @@ The following examples show two possible models of the `GenericMapItems` concept { typedef double Dart_info; typedef CGAL::Cell_attribute Edge_attrib; - typedef CGAL::cpp11::tuple Attributes; + typedef std::tuple Attributes; }; }; \endcode diff --git a/Combinatorial_map/examples/Combinatorial_map/map_3_dynamic_onmerge.cpp b/Combinatorial_map/examples/Combinatorial_map/map_3_dynamic_onmerge.cpp index 951013b3dde..147653f426b 100644 --- a/Combinatorial_map/examples/Combinatorial_map/map_3_dynamic_onmerge.cpp +++ b/Combinatorial_map/examples/Combinatorial_map/map_3_dynamic_onmerge.cpp @@ -10,7 +10,7 @@ struct Myitem struct Dart_wrapper { typedef CGAL::Cell_attribute Face_attribute; // A weight - typedef CGAL::cpp11::tuple Attributes; + typedef std::tuple Attributes; }; }; diff --git a/Combinatorial_map/examples/Combinatorial_map/map_3_with_colored_facets.cpp b/Combinatorial_map/examples/Combinatorial_map/map_3_with_colored_facets.cpp index ff8d316a54f..766cbfa57ec 100644 --- a/Combinatorial_map/examples/Combinatorial_map/map_3_with_colored_facets.cpp +++ b/Combinatorial_map/examples/Combinatorial_map/map_3_with_colored_facets.cpp @@ -27,7 +27,7 @@ struct Myitem { typedef CGAL::Cell_attribute Facet_attribute; - typedef CGAL::cpp11::tuple Attributes; + typedef std::tuple Attributes; }; }; diff --git a/Combinatorial_map/include/CGAL/Combinatorial_map.h b/Combinatorial_map/include/CGAL/Combinatorial_map.h index 9ccf7126441..c951257df00 100644 --- a/Combinatorial_map/include/CGAL/Combinatorial_map.h +++ b/Combinatorial_map/include/CGAL/Combinatorial_map.h @@ -294,7 +294,7 @@ namespace CGAL { boost::unordered_map* dart_mapping=NULL) { - CGAL::cpp11::tuple<> converters; + std::tuple<> converters; Default_converter_dart_info dartinfoconverter; Default_converter_cmap_0attributes_with_point pointconverter; copy(amap, converters, dartinfoconverter, pointconverter, dart_mapping); @@ -1311,7 +1311,7 @@ namespace CGAL { CGAL_static_assertion_msg(Helper::template Dimension_index::value>=0, "create_attribute but i-attributes are disabled"); typename Attribute_handle::type res= - CGAL::cpp11::get::value> + std::get::value> (mattribute_containers).emplace(args...); // Reinitialize the ref counting of the new attribute. This is normally // not required except if create_attribute is used as "copy contructor". @@ -1328,7 +1328,7 @@ namespace CGAL { { CGAL_static_assertion_msg(Helper::template Dimension_index::value>=0, "erase_attribute but i-attributes are disabled"); - CGAL::cpp11::get::value> + std::get::value> (mattribute_containers).erase(h); } @@ -1338,7 +1338,7 @@ namespace CGAL { { CGAL_static_assertion_msg(Helper::template Dimension_index::value>=0, "is_attribute_used but i-attributes are disabled"); - return CGAL::cpp11::get::value> + return std::get::value> (mattribute_containers).is_used(ah); } @@ -1348,7 +1348,7 @@ namespace CGAL { { CGAL_static_assertion_msg(Helper::template Dimension_index::value>=0, "number_of_attributes but i-attributes are disabled"); - return CGAL::cpp11::get::value> + return std::get::value> (mattribute_containers).size(); } @@ -1377,7 +1377,7 @@ namespace CGAL { { CGAL_static_assertion_msg(Helper::template Dimension_index::value>=0, "attributes but i-attributes are disabled"); - return CGAL::cpp11::get::value> + return std::get::value> (mattribute_containers); } @@ -1386,7 +1386,7 @@ namespace CGAL { { CGAL_static_assertion_msg(Helper::template Dimension_index::value>=0, "attributes but i-attributes are disabled"); - return CGAL::cpp11::get::value> + return std::get::value> (mattribute_containers); } @@ -1402,7 +1402,7 @@ namespace CGAL { "onsplit_functor but " "i-attributes are disabled"); - return CGAL::cpp11::get::value> + return std::get::value> (m_onsplit_functors); } @@ -1418,7 +1418,7 @@ namespace CGAL { "onsplit_functor but " "i-attributes are disabled"); - return CGAL::cpp11::get::value> + return std::get::value> (m_onsplit_functors); } @@ -1434,7 +1434,7 @@ namespace CGAL { "onsplit_functor but " "i-attributes are disabled"); - return CGAL::cpp11::get::value> + return std::get::value> (m_onmerge_functors); } // Get the ith dynamic onmerge functor (by reference so that we can @@ -1449,7 +1449,7 @@ namespace CGAL { "onsplit_functor but " "i-attributes are disabled"); - return CGAL::cpp11::get::value> + return std::get::value> (m_onmerge_functors); } diff --git a/Combinatorial_map/include/CGAL/Combinatorial_map_min_items.h b/Combinatorial_map/include/CGAL/Combinatorial_map_min_items.h index 4835076d627..3f1f1fcdb31 100644 --- a/Combinatorial_map/include/CGAL/Combinatorial_map_min_items.h +++ b/Combinatorial_map/include/CGAL/Combinatorial_map_min_items.h @@ -43,7 +43,7 @@ namespace CGAL { struct Dart_wrapper { typedef CGAL::Dart< d, Refs > Dart; - typedef CGAL::cpp11::tuple<> Attributes; + typedef std::tuple<> Attributes; }; }; diff --git a/Combinatorial_map/include/CGAL/Combinatorial_map_storages.h b/Combinatorial_map/include/CGAL/Combinatorial_map_storages.h index 4cd59641644..5b37734b84f 100644 --- a/Combinatorial_map/include/CGAL/Combinatorial_map_storages.h +++ b/Combinatorial_map/include/CGAL/Combinatorial_map_storages.h @@ -212,7 +212,7 @@ namespace CGAL { { CGAL_static_assertion_msg(Helper::template Dimension_index::value>=0, "attribute called but i-attributes are disabled."); - return CGAL::cpp11::get::value> + return std::get::value> (ADart->mattribute_handles); } template @@ -221,7 +221,7 @@ namespace CGAL { { CGAL_static_assertion_msg(Helper::template Dimension_index::value>=0, "attribute called but i-attributes are disabled."); - return CGAL::cpp11::get::value> + return std::get::value> (ADart->mattribute_handles); } @@ -233,7 +233,7 @@ namespace CGAL { CGAL_static_assertion_msg(Helper::template Dimension_index::value>=0, "copy_attribute called but i-attributes are disabled."); typename Attribute_handle::type res= - CGAL::cpp11::get::value> + std::get::value> (mattribute_containers).emplace(*ah); this->template init_attribute_ref_counting(res); return res; @@ -377,7 +377,7 @@ namespace CGAL { template void display_attribute(typename Attribute_const_handle::type ah) const - { std::cout<< CGAL::cpp11::get::value> + { std::cout<< std::get::value> (mattribute_containers).index(ah); } protected: @@ -386,7 +386,7 @@ namespace CGAL { void basic_set_dart_attribute(Dart_handle dh, typename Attribute_handle::type ah) { - CGAL::cpp11::get::value> + std::get::value> (dh->mattribute_handles) = ah; } diff --git a/Combinatorial_map/include/CGAL/Dart.h b/Combinatorial_map/include/CGAL/Dart.h index e2de6901fc4..7c304075109 100644 --- a/Combinatorial_map/include/CGAL/Dart.h +++ b/Combinatorial_map/include/CGAL/Dart.h @@ -186,7 +186,7 @@ namespace CGAL { { CGAL_static_assertion_msg(Helper::template Dimension_index::value>=0, "attribute called but i-attributes are disabled."); - return CGAL::cpp11::get::value> + return std::get::value> (mattribute_handles); } template @@ -194,7 +194,7 @@ namespace CGAL { { CGAL_static_assertion_msg(Helper::template Dimension_index::value>=0, "attribute called but i-attributes are disabled."); - return CGAL::cpp11::get::value> + return std::get::value> (mattribute_handles); } @@ -299,7 +299,7 @@ namespace CGAL { { CGAL_static_assertion_msg(Helper::template Dimension_index::value>=0, "attribute called but i-attributes are disabled."); - return CGAL::cpp11::get::value> + return std::get::value> (mattribute_handles); } template @@ -307,7 +307,7 @@ namespace CGAL { { CGAL_static_assertion_msg(Helper::template Dimension_index::value>=0, "attribute called but i-attributes are disabled."); - return CGAL::cpp11::get::value> + return std::get::value> (mattribute_handles); } }; diff --git a/Combinatorial_map/include/CGAL/internal/Combinatorial_map_copy_functors.h b/Combinatorial_map/include/CGAL/internal/Combinatorial_map_copy_functors.h index 47f240c2967..9875d97a787 100644 --- a/Combinatorial_map/include/CGAL/internal/Combinatorial_map_copy_functors.h +++ b/Combinatorial_map/include/CGAL/internal/Combinatorial_map_copy_functors.h @@ -163,7 +163,7 @@ struct Get_convert_attribute_functor run( const Map1& cmap1, Map2& cmap2, typename Map1::Dart_const_handle dh1, typename Map2::Dart_handle dh2, const Converters& converters) { - return CGAL::cpp11::get(converters) (cmap1, cmap2, dh1, dh2); + return std::get(converters) (cmap1, cmap2, dh1, dh2); } }; // **************************************************************************** diff --git a/Combinatorial_map/include/CGAL/internal/Combinatorial_map_internal_functors.h b/Combinatorial_map/include/CGAL/internal/Combinatorial_map_internal_functors.h index 8e1e4098fa5..4392a284012 100644 --- a/Combinatorial_map/include/CGAL/internal/Combinatorial_map_internal_functors.h +++ b/Combinatorial_map/include/CGAL/internal/Combinatorial_map_internal_functors.h @@ -114,9 +114,9 @@ struct Swap_attributes_functor template static void run( CMap& cmap1, CMap& cmap2) - { CGAL::cpp11::get::value> + { std::get::value> (cmap1.mattribute_containers).swap( - CGAL::cpp11::get::value> + std::get::value> (cmap2.mattribute_containers)); } }; @@ -159,9 +159,9 @@ struct Call_split_functor run(amap.template get_attribute(a1), amap.template get_attribute(a2)); // Dynamic version - if ( CGAL::cpp11::get::value> + if ( std::get::value> (amap.m_onsplit_functors) ) - CGAL::cpp11::get::value> + std::get::value> (amap.m_onsplit_functors) (amap.template get_attribute(a1), amap.template get_attribute(a2)); } @@ -196,9 +196,9 @@ struct Call_merge_functor run(amap.template get_attribute(a1), amap.template get_attribute(a2)); // Dynamic version - if ( CGAL::cpp11::get::value> + if ( std::get::value> (amap.m_onmerge_functors) ) - CGAL::cpp11::get::value> + std::get::value> (amap.m_onmerge_functors) (amap.template get_attribute(a1), amap.template get_attribute(a2)); } diff --git a/Combinatorial_map/include/CGAL/internal/Combinatorial_map_utility.h b/Combinatorial_map/include/CGAL/internal/Combinatorial_map_utility.h index 9d3c9b2d792..ef34a88e8d4 100644 --- a/Combinatorial_map/include/CGAL/internal/Combinatorial_map_utility.h +++ b/Combinatorial_map/include/CGAL/internal/Combinatorial_map_utility.h @@ -72,11 +72,11 @@ namespace CGAL { typedef CGAL::Tag_true type; }; // Get the type Attributes defined as inner type of T. - // If T::Attributes is not defined, defined CGAL::cpp11::tuple<> as type. + // If T::Attributes is not defined, defined std::tuple<> as type. BOOST_MPL_HAS_XXX_TRAIT_NAMED_DEF(Has_attributes_tuple,Attributes,false) template::value > struct Get_attributes_tuple - { typedef CGAL::cpp11::tuple<> type; }; + { typedef std::tuple<> type; }; template struct Get_attributes_tuple { typedef typename T::Attributes type; }; @@ -86,21 +86,21 @@ namespace CGAL template struct Convert_tuple_with_void; template - struct Convert_tuple_with_void > + struct Convert_tuple_with_void > { - typedef CGAL::cpp11::tuple::type... > type; + typedef std::tuple::type... > type; }; // Length of a variadic template template struct My_length; template - struct My_length > + struct My_length > { - static const int value = My_length >::value + 1; + static const int value = My_length >::value + 1; }; template<> - struct My_length > + struct My_length > { static const int value = 0; }; @@ -109,17 +109,17 @@ namespace CGAL template struct Number_of_type_in_tuple; template - struct Number_of_type_in_tuple >{ + struct Number_of_type_in_tuple >{ static const int value=Number_of_type_in_tuple - >::value+1; + >::value+1; }; template - struct Number_of_type_in_tuple >{ + struct Number_of_type_in_tuple >{ static const int value=Number_of_type_in_tuple - >::value; + >::value; }; template - struct Number_of_type_in_tuple >{ + struct Number_of_type_in_tuple >{ static const int value=0; }; @@ -127,21 +127,21 @@ namespace CGAL template struct Number_of_different_type_in_tuple; template - struct Number_of_different_type_in_tuple > { static const int value=Number_of_different_type_in_tuple - >::value+1; + >::value+1; }; template - struct Number_of_different_type_in_tuple > { static const int value=Number_of_different_type_in_tuple - >::value; + >::value; }; template - struct Number_of_different_type_in_tuple > + struct Number_of_different_type_in_tuple > { static const int value=0; }; @@ -154,23 +154,23 @@ namespace CGAL struct Nb_type_in_tuple_up_to_k; template - struct Nb_type_in_tuple_up_to_k,dim> + struct Nb_type_in_tuple_up_to_k,dim> { static const int pos= Nb_type_in_tuple_up_to_k - ,dim>::pos - 1; + ,dim>::pos - 1; static const int value = ( pos==k ) ? ( boost::is_same::value ? 0:-dim-1 ) : ( ( pos::value ? 1:0 ) + Nb_type_in_tuple_up_to_k - ,dim >::value) :0 ); }; template - struct Nb_type_in_tuple_up_to_k,dim > + struct Nb_type_in_tuple_up_to_k,dim > { static const int pos=dim; static const int value=(pos==k? @@ -187,23 +187,23 @@ namespace CGAL template struct Nb_type_different_in_tuple_up_to_k,dim> + std::tuple,dim> { static const int pos = Nb_type_different_in_tuple_up_to_k - ,dim >::pos - 1; + ,dim >::pos - 1; static const int value = ( pos==k ) ? ( boost::is_same::value ? -dim-1 : 0 ) : ( ( pos::value ? 0:1 ) + Nb_type_different_in_tuple_up_to_k - ,dim >::value) + ,dim >::value) :0 ); }; template struct Nb_type_different_in_tuple_up_to_k,dim > + std::tuple,dim > { static const int pos=dim; static const int value=(pos==k? @@ -215,38 +215,38 @@ namespace CGAL template