diff --git a/Triangulation_3/include/CGAL/Delaunay_triangulation_3.h b/Triangulation_3/include/CGAL/Delaunay_triangulation_3.h index 555f0288314..0c02dbcfb49 100644 --- a/Triangulation_3/include/CGAL/Delaunay_triangulation_3.h +++ b/Triangulation_3/include/CGAL/Delaunay_triangulation_3.h @@ -198,7 +198,7 @@ public: { int n = number_of_vertices(); - std::vector points (first, last); + std::vector points CGAL_make_vector(first, last); std::random_shuffle (points.begin(), points.end()); spatial_sort (points.begin(), points.end(), geom_traits()); diff --git a/Triangulation_3/include/CGAL/Regular_triangulation_3.h b/Triangulation_3/include/CGAL/Regular_triangulation_3.h index 4c168b34671..47832b13bc0 100644 --- a/Triangulation_3/include/CGAL/Regular_triangulation_3.h +++ b/Triangulation_3/include/CGAL/Regular_triangulation_3.h @@ -136,7 +136,7 @@ public: { int n = number_of_vertices(); - std::vector points (first, last); + std::vector points CGAL_make_vector(first, last); std::random_shuffle (points.begin(), points.end()); spatial_sort (points.begin(), points.end(), geom_traits()); diff --git a/Triangulation_3/include/CGAL/Triangulation_3.h b/Triangulation_3/include/CGAL/Triangulation_3.h index 57be4cbbafe..b6a46e178a6 100644 --- a/Triangulation_3/include/CGAL/Triangulation_3.h +++ b/Triangulation_3/include/CGAL/Triangulation_3.h @@ -576,7 +576,7 @@ public: { int n = number_of_vertices(); - std::vector points (first, last); + std::vector points CGAL_make_vector(first, last); std::random_shuffle (points.begin(), points.end()); spatial_sort (points.begin(), points.end(), geom_traits()); @@ -2945,14 +2945,8 @@ operator==(const Triangulation_3 &t1, if (dim == 1) { // It's enough to test that the points are the same, // since the triangulation is uniquely defined in this case. -#ifndef CGAL_CFG_MISSING_TEMPLATE_VECTOR_CONSTRUCTORS_BUG - std::vector V1(t1.points_begin(), t1.points_end()); - std::vector V2(t2.points_begin(), t2.points_end()); -#else - std::vector V1, V2; - std::copy(t1.points_begin(), t1.points_end(), std::back_inserter(V1)); - std::copy(t2.points_begin(), t2.points_end(), std::back_inserter(V2)); -#endif + std::vector V1 CGAL_make_vector(t1.points_begin(), t1.points_end()); + std::vector V2 CGAL_make_vector(t2.points_begin(), t2.points_end()); std::sort(V1.begin(), V1.end(), compose(Is_negative(),// implicit conversion of CGAL::Sign t1.geom_traits().compare_xyz_3_object())); diff --git a/Triangulation_3/include/CGAL/Triangulation_hierarchy_3.h b/Triangulation_3/include/CGAL/Triangulation_hierarchy_3.h index 4cb460e07b6..4304f94a205 100644 --- a/Triangulation_3/include/CGAL/Triangulation_hierarchy_3.h +++ b/Triangulation_3/include/CGAL/Triangulation_hierarchy_3.h @@ -101,7 +101,7 @@ public: { int n = number_of_vertices(); - std::vector points (first, last); + std::vector points CGAL_make_vector(first, last); std::random_shuffle (points.begin(), points.end()); spatial_sort (points.begin(), points.end(), geom_traits());