From e6536aaf633acf14328ec2c26e4274e3c6fc1852 Mon Sep 17 00:00:00 2001 From: Laurent Rineau Date: Tue, 9 Jun 2020 20:15:16 +0200 Subject: [PATCH] Remove cpp11::(tuple|get) And use `#ifdef CGAL_NO_DEPRECATED_CODE` around the backward compatibility code in ``. --- Combinatorial_map/include/CGAL/Combinatorial_map.h | 5 +++-- Generalized_map/include/CGAL/Generalized_map.h | 5 +++-- .../include/CGAL/Orthogonal_incremental_neighbor_search.h | 4 ++-- .../Surface_mesh_topology/internal/Generic_map_selector.h | 4 +++- .../Surface_mesh_topology/internal/Minimal_quadrangulation.h | 3 ++- .../path_with_rle_deformation_tests.cpp | 3 ++- .../test/Surface_mesh_topology/test_homotopy.cpp | 3 ++- 7 files changed, 17 insertions(+), 10 deletions(-) diff --git a/Combinatorial_map/include/CGAL/Combinatorial_map.h b/Combinatorial_map/include/CGAL/Combinatorial_map.h index f45a2864e13..580444e9812 100644 --- a/Combinatorial_map/include/CGAL/Combinatorial_map.h +++ b/Combinatorial_map/include/CGAL/Combinatorial_map.h @@ -41,6 +41,7 @@ #include #include #include +#include #include #include #include @@ -439,7 +440,7 @@ namespace CGAL { bool copy_perforated_darts=false, size_type mark_perforated=INVALID_MARK) { - CGAL::cpp11::tuple<> converters; + std::tuple<> converters; copy(amap, origin_to_copy, copy_to_origin, converters, copy_perforated_darts, mark_perforated); } @@ -454,7 +455,7 @@ namespace CGAL { bool copy_perforated_darts=false, size_type mark_perforated=INVALID_MARK) { - CGAL::cpp11::tuple<> converters; + std::tuple<> converters; copy_from_const(amap, origin_to_copy, copy_to_origin, converters, copy_perforated_darts, mark_perforated); } diff --git a/Generalized_map/include/CGAL/Generalized_map.h b/Generalized_map/include/CGAL/Generalized_map.h index eac7342dac5..3c79b6d2c37 100644 --- a/Generalized_map/include/CGAL/Generalized_map.h +++ b/Generalized_map/include/CGAL/Generalized_map.h @@ -31,6 +31,7 @@ #include #include #include +#include #include #include #include @@ -403,7 +404,7 @@ namespace CGAL { bool copy_perforated_darts=false, size_type mark_perforated=INVALID_MARK) { - CGAL::cpp11::tuple<> converters; + std::tuple<> converters; copy(amap, origin_to_copy, copy_to_origin, converters, copy_perforated_darts, mark_perforated); } @@ -418,7 +419,7 @@ namespace CGAL { bool copy_perforated_darts=false, size_type mark_perforated=INVALID_MARK) { - CGAL::cpp11::tuple<> converters; + std::tuple<> converters; copy_from_const(amap, origin_to_copy, copy_to_origin, converters, copy_perforated_darts, mark_perforated); } diff --git a/Spatial_searching/include/CGAL/Orthogonal_incremental_neighbor_search.h b/Spatial_searching/include/CGAL/Orthogonal_incremental_neighbor_search.h index 588886660e1..28eaaae9d8c 100644 --- a/Spatial_searching/include/CGAL/Orthogonal_incremental_neighbor_search.h +++ b/Spatial_searching/include/CGAL/Orthogonal_incremental_neighbor_search.h @@ -290,7 +290,7 @@ namespace CGAL { bool next_neighbour_found; if (!(PriorityQueue.empty())) { - rd = CGAL::cpp11::get<1>(*PriorityQueue.top()); + rd = std::get<1>(*PriorityQueue.top()); next_neighbour_found = (search_furthest ? multiplication_factor*rd < Item_PriorityQueue.top()->second : multiplication_factor*rd > Item_PriorityQueue.top()->second); @@ -325,7 +325,7 @@ namespace CGAL { bool next_neighbour_found; if (!(PriorityQueue.empty())) { - rd = CGAL::cpp11::get<1>(*PriorityQueue.top()); + rd = std::get<1>(*PriorityQueue.top()); next_neighbour_found = (search_furthest ? multiplication_factor*rd < Item_PriorityQueue.top()->second : multiplication_factor*rd > Item_PriorityQueue.top()->second); diff --git a/Surface_mesh_topology/include/CGAL/Surface_mesh_topology/internal/Generic_map_selector.h b/Surface_mesh_topology/include/CGAL/Surface_mesh_topology/internal/Generic_map_selector.h index 4cca50217f7..fcc5322c084 100644 --- a/Surface_mesh_topology/include/CGAL/Surface_mesh_topology/internal/Generic_map_selector.h +++ b/Surface_mesh_topology/include/CGAL/Surface_mesh_topology/internal/Generic_map_selector.h @@ -22,6 +22,8 @@ #include #include +#include + namespace CGAL { namespace Surface_mesh_topology { namespace internal { @@ -32,7 +34,7 @@ namespace internal { struct Dart_wrapper { using Vertex_attribute = CGAL::Cell_attribute; - using Attributes = CGAL::cpp11::tuple; + using Attributes = std::tuple; }; }; diff --git a/Surface_mesh_topology/include/CGAL/Surface_mesh_topology/internal/Minimal_quadrangulation.h b/Surface_mesh_topology/include/CGAL/Surface_mesh_topology/internal/Minimal_quadrangulation.h index 1506ec864e9..4481eebc353 100644 --- a/Surface_mesh_topology/include/CGAL/Surface_mesh_topology/internal/Minimal_quadrangulation.h +++ b/Surface_mesh_topology/include/CGAL/Surface_mesh_topology/internal/Minimal_quadrangulation.h @@ -30,6 +30,7 @@ #include #include #include +#include #include namespace CGAL { @@ -45,7 +46,7 @@ struct Minimal_quadrangulation_local_map_items typedef std::size_t Dart_info; #endif // CGAL_PWRLE_TURN_V3 typedef CGAL::Cell_attribute Vertex_attribute; - typedef CGAL::cpp11::tuple Attributes; + typedef std::tuple Attributes; }; }; diff --git a/Surface_mesh_topology/test/Surface_mesh_topology/path_with_rle_deformation_tests.cpp b/Surface_mesh_topology/test/Surface_mesh_topology/path_with_rle_deformation_tests.cpp index 90a17e8f79b..e50a45c1587 100644 --- a/Surface_mesh_topology/test/Surface_mesh_topology/path_with_rle_deformation_tests.cpp +++ b/Surface_mesh_topology/test/Surface_mesh_topology/path_with_rle_deformation_tests.cpp @@ -5,6 +5,7 @@ #include #include #include +#include #include "Creation_of_test_cases_for_paths.h" @@ -22,7 +23,7 @@ struct MyItems typedef std::size_t Dart_info; #endif // CGAL_PWRLE_TURN_V3 typedef CGAL::Cell_attribute_with_point Vertex_attrib; - typedef CGAL::cpp11::tuple Attributes; + typedef std::tuple Attributes; }; }; diff --git a/Surface_mesh_topology/test/Surface_mesh_topology/test_homotopy.cpp b/Surface_mesh_topology/test/Surface_mesh_topology/test_homotopy.cpp index 6a95e7a3f26..19af0dc1677 100644 --- a/Surface_mesh_topology/test/Surface_mesh_topology/test_homotopy.cpp +++ b/Surface_mesh_topology/test/Surface_mesh_topology/test_homotopy.cpp @@ -5,6 +5,7 @@ #include #include #include +#include #include "Creation_of_test_cases_for_paths.h" @@ -22,7 +23,7 @@ struct MyItems typedef std::size_t Dart_info; #endif // CGAL_PWRLE_TURN_V3 typedef CGAL::Cell_attribute_with_point Vertex_attrib; - typedef CGAL::cpp11::tuple Attributes; + typedef std::tuple Attributes; }; };