From 2ce16d14b5f5b7fe0eb72b3dee219e416fb2fa2b Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?S=C3=A9bastien=20Loriot?= Date: Tue, 19 Mar 2019 13:27:30 +0100 Subject: [PATCH] remove workaround code for cpp11 in triangulation packages --- .../Periodic_2_Delaunay_triangulation_2.h | 2 -- .../Periodic_3_triangulation_ds_cell_base_3.h | 14 --------- .../Voronoi_vertex_ring_C2.h | 8 ----- .../CGAL/Triangulation_data_structure_3.h | 2 -- .../CGAL/Triangulation_ds_cell_base_3.h | 21 ------------- .../CGAL/Triangulation_data_structure.h | 30 ------------------- 6 files changed, 77 deletions(-) diff --git a/Periodic_2_triangulation_2/include/CGAL/Periodic_2_Delaunay_triangulation_2.h b/Periodic_2_triangulation_2/include/CGAL/Periodic_2_Delaunay_triangulation_2.h index fba94a74ffe..2a9c6f27743 100644 --- a/Periodic_2_triangulation_2/include/CGAL/Periodic_2_Delaunay_triangulation_2.h +++ b/Periodic_2_triangulation_2/include/CGAL/Periodic_2_Delaunay_triangulation_2.h @@ -153,9 +153,7 @@ public: insert(first, last); } -#ifndef CGAL_CFG_NO_CPP0X_DELETED_AND_DEFAULT_FUNCTIONS Periodic_2_Delaunay_triangulation_2& operator=(const Periodic_2_Delaunay_triangulation_2&)=default; -#endif // \} /// \name Methods regarding the covering diff --git a/Periodic_3_triangulation_3/include/CGAL/Periodic_3_triangulation_ds_cell_base_3.h b/Periodic_3_triangulation_3/include/CGAL/Periodic_3_triangulation_ds_cell_base_3.h index c80c645fd4c..22809557d1a 100644 --- a/Periodic_3_triangulation_3/include/CGAL/Periodic_3_triangulation_ds_cell_base_3.h +++ b/Periodic_3_triangulation_3/include/CGAL/Periodic_3_triangulation_ds_cell_base_3.h @@ -56,31 +56,17 @@ public: Periodic_3_triangulation_ds_cell_base_3( const Vertex_handle& v0, const Vertex_handle& v1, const Vertex_handle& v2, const Vertex_handle& v3) -#ifndef CGAL_CFG_NO_CPP0X_UNIFIED_INITIALIZATION_SYNTAX : V{v0, v1, v2, v3}, _additional_flag(0), off(0) {} -#else - : _additional_flag(0), off(0) { - set_vertices(v0, v1, v2, v3); - set_neighbors(); - } -#endif Periodic_3_triangulation_ds_cell_base_3( const Vertex_handle& v0, const Vertex_handle& v1, const Vertex_handle& v2, const Vertex_handle& v3, const Cell_handle& n0, const Cell_handle& n1, const Cell_handle& n2, const Cell_handle& n3) -#ifndef CGAL_CFG_NO_CPP0X_UNIFIED_INITIALIZATION_SYNTAX : N{n0, n1, n2, n3}, V{v0, v1, v2, v3}, _additional_flag(0), off(0) {} -#else - : _additional_flag(0), off(0) { - set_vertices(v0, v1, v2, v3); - set_neighbors(n0, n1, n2, n3); - } -#endif // ACCESS FUNCTIONS diff --git a/Segment_Delaunay_graph_Linf_2/include/CGAL/Segment_Delaunay_graph_Linf_2/Voronoi_vertex_ring_C2.h b/Segment_Delaunay_graph_Linf_2/include/CGAL/Segment_Delaunay_graph_Linf_2/Voronoi_vertex_ring_C2.h index 2a9051028e2..5332c98718b 100644 --- a/Segment_Delaunay_graph_Linf_2/include/CGAL/Segment_Delaunay_graph_Linf_2/Voronoi_vertex_ring_C2.h +++ b/Segment_Delaunay_graph_Linf_2/include/CGAL/Segment_Delaunay_graph_Linf_2/Voronoi_vertex_ring_C2.h @@ -41,15 +41,7 @@ namespace CGAL { namespace SegmentDelaunayGraphLinf_2 { -#ifndef CGAL_CFG_NO_CPP0X_TUPLE -#if (defined(_MSC_VER) && (_MSC_VER < 1700)) -#define sdg_tuple_maker cpp11::make_tuple -#else #define sdg_tuple_maker std::forward_as_tuple -#endif -#else -#define sdg_tuple_maker cpp11::make_tuple -#endif template class Voronoi_vertex_ring_C2 diff --git a/TDS_3/include/CGAL/Triangulation_data_structure_3.h b/TDS_3/include/CGAL/Triangulation_data_structure_3.h index f9cb9a52713..9ffdc898524 100644 --- a/TDS_3/include/CGAL/Triangulation_data_structure_3.h +++ b/TDS_3/include/CGAL/Triangulation_data_structure_3.h @@ -832,9 +832,7 @@ public: filter = f.filter; return *this; } -#ifndef CGAL_CFG_NO_CPP0X_DELETED_AND_DEFAULT_FUNCTIONS Facet_it(const Facet_it&)=default; -#endif }; Facet_it facet_it() { return Facet_it(output, filter); diff --git a/TDS_3/include/CGAL/Triangulation_ds_cell_base_3.h b/TDS_3/include/CGAL/Triangulation_ds_cell_base_3.h index 38726c9fa30..e67cabd8331 100644 --- a/TDS_3/include/CGAL/Triangulation_ds_cell_base_3.h +++ b/TDS_3/include/CGAL/Triangulation_ds_cell_base_3.h @@ -57,7 +57,6 @@ public: Triangulation_ds_cell_base_3(Vertex_handle v0, Vertex_handle v1, Vertex_handle v2, Vertex_handle v3) -#ifndef CGAL_CFG_NO_CPP0X_UNIFIED_INITIALIZATION_SYNTAX : V{v0, v1, v2, v3} { #ifdef SHOW_REMAINING_BAD_ELEMENT_IN_RED @@ -65,32 +64,12 @@ public: mark2 = -1; #endif } -#else - { - set_vertices(v0, v1, v2, v3); -#ifdef SHOW_REMAINING_BAD_ELEMENT_IN_RED - mark = -1; - mark2 = -1; -#endif - } -#endif Triangulation_ds_cell_base_3(Vertex_handle v0, Vertex_handle v1, Vertex_handle v2, Vertex_handle v3, Cell_handle n0, Cell_handle n1, Cell_handle n2, Cell_handle n3) -#ifndef CGAL_CFG_NO_CPP0X_UNIFIED_INITIALIZATION_SYNTAX : N{n0, n1, n2, n3}, V{v0, v1, v2, v3} {} -#else - { - set_neighbors(n0, n1, n2, n3); - set_vertices(v0, v1, v2, v3); -#ifdef SHOW_REMAINING_BAD_ELEMENT_IN_RED - mark = -1; - mark2 = -1; -#endif - } -#endif // ACCESS FUNCTIONS diff --git a/Triangulation/include/CGAL/Triangulation_data_structure.h b/Triangulation/include/CGAL/Triangulation_data_structure.h index bfd8b078b3a..3dc06340604 100644 --- a/Triangulation/include/CGAL/Triangulation_data_structure.h +++ b/Triangulation/include/CGAL/Triangulation_data_structure.h @@ -609,7 +609,6 @@ public: OutputIterator incident_full_cells(Vertex_const_handle, OutputIterator) const; /* Concept */ template< typename OutputIterator > OutputIterator star(const Face &, OutputIterator) const; /* Concept */ -#ifndef CGAL_CFG_NO_CPP0X_DEFAULT_TEMPLATE_ARGUMENTS_FOR_FUNCTION_TEMPLATES template< typename OutputIterator, typename Comparator = std::less > OutputIterator incident_upper_faces(Vertex_const_handle v, int dim, OutputIterator out, Comparator cmp = Comparator()) { @@ -617,23 +616,6 @@ public: } template< typename OutputIterator, typename Comparator = std::less > OutputIterator incident_faces(Vertex_const_handle, int, OutputIterator, Comparator = Comparator(), bool = false) const; -#else - template< typename OutputIterator, typename Comparator > - OutputIterator incident_upper_faces(Vertex_const_handle v, int dim, OutputIterator out, Comparator cmp = Comparator()) - { - return incident_faces(v, dim, out, cmp, true); - } - template< typename OutputIterator > - OutputIterator incident_upper_faces(Vertex_const_handle v, int dim, OutputIterator out) - { - return incident_faces(v, dim, out, std::less(), true); - } - template< typename OutputIterator, typename Comparator > - OutputIterator incident_faces(Vertex_const_handle, int, OutputIterator, Comparator = Comparator(), bool = false) const; - template< typename OutputIterator > - OutputIterator incident_faces(Vertex_const_handle, int, OutputIterator, - std::less = std::less(), bool = false) const; -#endif // - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - INPUT / OUTPUT @@ -722,18 +704,6 @@ Triangulation_data_structure return ft; } -#ifdef CGAL_CFG_NO_CPP0X_DEFAULT_TEMPLATE_ARGUMENTS_FOR_FUNCTION_TEMPLATES -template< class Dim, class Vb, class Fcb > -template< typename OutputIterator > -OutputIterator -Triangulation_data_structure -::incident_faces(Vertex_const_handle v, int dim, OutputIterator out, - std::less cmp, bool upper_faces) const -{ - return incident_faces >(v, dim, out, cmp, upper_faces); -} -#endif - template< class Dim, class Vb, class Fcb > template< typename OutputIterator, typename Comparator > OutputIterator