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

remove workaround code for cpp11 in triangulation packages

This commit is contained in:
Sébastien Loriot 2019-03-19 13:27:30 +01:00
parent 5bac189dc3
commit 2ce16d14b5
6 changed files with 0 additions and 77 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
Periodic_2_triangulation_2/include/CGAL/Periodic_2_Delaunay_triangulation_2.h
View File

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

14
Periodic_3_triangulation_3/include/CGAL/Periodic_3_triangulation_ds_cell_base_3.h
View File

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

8
Segment_Delaunay_graph_Linf_2/include/CGAL/Segment_Delaunay_graph_Linf_2/Voronoi_vertex_ring_C2.h
View File

@ -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 K>
class Voronoi_vertex_ring_C2

2
TDS_3/include/CGAL/Triangulation_data_structure_3.h
View File

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

21
TDS_3/include/CGAL/Triangulation_ds_cell_base_3.h
View File

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

30
Triangulation/include/CGAL/Triangulation_data_structure.h
View File

@ -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<Vertex_const_handle> >
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<Vertex_const_handle> >
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<Vertex_const_handle>(), 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<Vertex_const_handle> = std::less<Vertex_const_handle>(), bool = false) const;
#endif
// - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - INPUT / OUTPUT
@ -722,18 +704,6 @@ Triangulation_data_structure<Dim, Vb, Fcb>
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<Dim, Vb, Fcb>
::incident_faces(Vertex_const_handle v, int dim, OutputIterator out,
std::less<Vertex_const_handle> cmp, bool upper_faces) const
{
return incident_faces<OutputIterator, std::less<Vertex_const_handle> >(v, dim, out, cmp, upper_faces);
}
#endif
template< class Dim, class Vb, class Fcb >
template< typename OutputIterator, typename Comparator >
OutputIterator