songsenand
/
cgal
mirror of https://github.com/CGAL/cgal
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

Remove cpp11::(tuple|get) 

And use `#ifdef CGAL_NO_DEPRECATED_CODE` around the backward
compatibility code in `<CGAL/config.h>`.
This commit is contained in:
Laurent Rineau 2020-06-09 20:15:16 +02:00
parent 52b83a9316
commit e6536aaf63
7 changed files with 17 additions and 10 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

5
Combinatorial_map/include/CGAL/Combinatorial_map.h
View File

@ -41,6 +41,7 @@
#include <bitset>
#include <vector>
#include <deque>
#include <tuple>
#include <boost/type_traits/is_same.hpp>
#include <boost/unordered_map.hpp>
#include <boost/graph/graph_traits.hpp>
@ -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);
}

5
Generalized_map/include/CGAL/Generalized_map.h
View File

@ -31,6 +31,7 @@
#include <bitset>
#include <vector>
#include <deque>
#include <tuple>
#include <boost/type_traits/is_same.hpp>
#include <boost/unordered_map.hpp>
#include <CGAL/config.h>
@ -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);
}

4
Spatial_searching/include/CGAL/Orthogonal_incremental_neighbor_search.h
View File

@ -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);

4
Surface_mesh_topology/include/CGAL/Surface_mesh_topology/internal/Generic_map_selector.h
View File

@ -22,6 +22,8 @@
#include <CGAL/Linear_cell_complex_for_generalized_map.h>
#include <CGAL/Polygonal_schema.h>
#include <tuple>
namespace CGAL {
namespace Surface_mesh_topology {
namespace internal {
@ -32,7 +34,7 @@ namespace internal {
struct Dart_wrapper
{
using Vertex_attribute = CGAL::Cell_attribute<Map, int>;
using Attributes = CGAL::cpp11::tuple<Vertex_attribute>;
using Attributes = std::tuple<Vertex_attribute>;
};
};

3
Surface_mesh_topology/include/CGAL/Surface_mesh_topology/internal/Minimal_quadrangulation.h
View File

@ -30,6 +30,7 @@
#include <CGAL/Timer.h>
#include <unordered_map>
#include <queue>
#include <tuple>
#include <iostream>
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<CMap, int32_t> Vertex_attribute;
typedef CGAL::cpp11::tuple<Vertex_attribute, void, void> Attributes;
typedef std::tuple<Vertex_attribute, void, void> Attributes;
};
};

3
Surface_mesh_topology/test/Surface_mesh_topology/path_with_rle_deformation_tests.cpp
View File

@ -5,6 +5,7 @@
#include <CGAL/Surface_mesh_topology/internal/Path_on_surface_with_rle.h>
#include <vector>
#include <sstream>
#include <tuple>
#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<CMap> Vertex_attrib;
typedef CGAL::cpp11::tuple<Vertex_attrib> Attributes;
typedef std::tuple<Vertex_attrib> Attributes;
};
};

3
Surface_mesh_topology/test/Surface_mesh_topology/test_homotopy.cpp
View File

@ -5,6 +5,7 @@
#include <CGAL/Surface_mesh_topology/internal/Path_generators.h>
#include <vector>
#include <sstream>
#include <tuple>
#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<CMap> Vertex_attrib;
typedef CGAL::cpp11::tuple<Vertex_attrib> Attributes;
typedef std::tuple<Vertex_attrib> Attributes;
};
};