diff --git a/Convex_hull_3/include/CGAL/Convex_hull_3/internal/Indexed_triangle_set.h b/Convex_hull_3/include/CGAL/Convex_hull_3/internal/Indexed_triangle_set.h index b092be1669b..52887308325 100644 --- a/Convex_hull_3/include/CGAL/Convex_hull_3/internal/Indexed_triangle_set.h +++ b/Convex_hull_3/include/CGAL/Convex_hull_3/internal/Indexed_triangle_set.h @@ -38,9 +38,6 @@ struct Indexed_triangle_set {} }; - - - template void add_isolated_points(const P& point, Indexed_triangle_set& its) { @@ -95,8 +92,8 @@ void copy_face_graph(const TDS& tds, Convex_hull_3::internal::Indexed_triangle_s template void clear(Convex_hull_3::internal::Indexed_triangle_set& its) { - its.vertices.clear(); - its.faces.clear(); + CGAL::internal::resize(its.vertices, 0); + CGAL::internal::resize(its.faces, 0); } diff --git a/Convex_hull_3/include/CGAL/convex_hull_3.h b/Convex_hull_3/include/CGAL/convex_hull_3.h index 5abf74e4d35..807aaa34c71 100644 --- a/Convex_hull_3/include/CGAL/convex_hull_3.h +++ b/Convex_hull_3/include/CGAL/convex_hull_3.h @@ -1086,30 +1086,34 @@ void convex_hull_3(const VertexListGraph& g, convex_hull_3(g,pm,CGAL::parameters::all_default()); } -template +template void convex_hull_3(InputIterator first, InputIterator beyond, - std::vector

& vertices, - std::vector >& faces, - typename std::enable_if::value>::type* = 0) + PointRange& vertices, + TriangleRange& faces, + typename std::enable_if::value>::type* = 0, + typename std::enable_if::value>::type* = 0, + typename std::enable_if::value>::type* = 0) { typedef typename std::iterator_traits::value_type Point_3; typedef typename Kernel_traits::type Traits; - Convex_hull_3::internal::Indexed_triangle_set< std::vector

, std::vector >> its(vertices,faces); + Convex_hull_3::internal::Indexed_triangle_set its(vertices,faces); convex_hull_3(first, beyond, its, Traits()); } -template +template void convex_hull_3(InputIterator first, InputIterator beyond, - std::vector

& vertices, - std::vector >& faces, + PointRange& vertices, + TriangleRange& faces, const Traits& traits, - typename std::enable_if::value>::type* = 0) + typename std::enable_if::value>::type* = 0, + typename std::enable_if::value>::type* = 0, + typename std::enable_if::value>::type* = 0) { typedef typename std::iterator_traits::value_type Point_3; - Convex_hull_3::internal::Indexed_triangle_set< std::vector

, std::vector >> its(vertices,faces); + Convex_hull_3::internal::Indexed_triangle_set its(vertices,faces); convex_hull_3(first, beyond, its, traits); }