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

Fix range insertion not using size_type as return type

This commit is contained in:
Mael Rouxel-Labbé 2021-03-30 11:27:39 +02:00
parent 274b8ed002
commit 4c4942008c
2 changed files with 15 additions and 13 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
Triangulation_on_sphere_2/doc/Triangulation_on_sphere_2/CGAL/Delaunay_triangulation_on_sphere_2.h
View File

@ -139,7 +139,7 @@ public:
\tparam PointOnSphereIterator must be a model of `InputIterator` with value type `Point`. \tparam PointOnSphereIterator must be a model of `InputIterator` with value type `Point`.
*/ */
template <class PointOnSphereIterator> template <class PointOnSphereIterator>
std::ptrdiff_t insert(PointOnSphereIterator first, PointOnSphereIterator beyond); size_type insert(PointOnSphereIterator first, PointOnSphereIterator beyond);
/*! /*!
removes the vertex `v` from the triangulation. removes the vertex `v` from the triangulation.

14
Triangulation_on_sphere_2/include/CGAL/Delaunay_triangulation_on_sphere_2.h
View File

@ -59,6 +59,8 @@ public:
typedef typename Geom_traits::Segment_3 Segment_3; typedef typename Geom_traits::Segment_3 Segment_3;
typedef typename Geom_traits::Arc_on_sphere_2 Arc_on_sphere_2; typedef typename Geom_traits::Arc_on_sphere_2 Arc_on_sphere_2;
typedef typename Base::size_type size_type;
typedef typename Base::Vertex Vertex; typedef typename Base::Vertex Vertex;
typedef typename Base::Vertex_handle Vertex_handle; typedef typename Base::Vertex_handle Vertex_handle;
typedef typename Base::Edge Edge; typedef typename Base::Edge Edge;
@ -266,14 +268,14 @@ public:
// Input range has value type Point, with Point != Point_3 // Input range has value type Point, with Point != Point_3
template <typename InputIterator> template <typename InputIterator>
int insert(InputIterator first, InputIterator beyond, size_type insert(InputIterator first, InputIterator beyond,
typename std::enable_if< typename std::enable_if<
!std::is_same<typename std::iterator_traits<InputIterator>::value_type, !std::is_same<typename std::iterator_traits<InputIterator>::value_type,
Point_3>::value>::type* = nullptr); Point_3>::value>::type* = nullptr);
// Input range has value type Point_3, possibly with Point == Point_3 // Input range has value type Point_3, possibly with Point == Point_3
template <typename InputIterator> template <typename InputIterator>
int insert(InputIterator first, InputIterator beyond, size_type insert(InputIterator first, InputIterator beyond,
typename std::enable_if< typename std::enable_if<
std::is_same<typename std::iterator_traits<InputIterator>::value_type, std::is_same<typename std::iterator_traits<InputIterator>::value_type,
Point_3>::value>::type* = nullptr); Point_3>::value>::type* = nullptr);
@ -599,7 +601,7 @@ insert(const Point& p, Face_handle start)
template <typename Gt, typename Tds> template <typename Gt, typename Tds>
template <typename InputIterator> template <typename InputIterator>
int typename Delaunay_triangulation_on_sphere_2<Gt, Tds>::size_type
Delaunay_triangulation_on_sphere_2<Gt, Tds>:: Delaunay_triangulation_on_sphere_2<Gt, Tds>::
insert(InputIterator first, InputIterator beyond, insert(InputIterator first, InputIterator beyond,
typename std::enable_if< typename std::enable_if<
@ -609,7 +611,7 @@ insert(InputIterator first, InputIterator beyond,
CGAL_static_assertion((std::is_same<typename std::iterator_traits<InputIterator>::value_type, Point>::value)); CGAL_static_assertion((std::is_same<typename std::iterator_traits<InputIterator>::value_type, Point>::value));
CGAL_static_assertion(!(std::is_same<Point, Point_3>::value)); CGAL_static_assertion(!(std::is_same<Point, Point_3>::value));
const int n = number_of_vertices(); const size_type n = number_of_vertices();
// On paper, Spatial_sort_traits_adapter_3 should be used. However, it is not compatible // On paper, Spatial_sort_traits_adapter_3 should be used. However, it is not compatible
// with spatial_sort_on_sphere() because of the way Transform_coordinates_traits_3 were written: // with spatial_sort_on_sphere() because of the way Transform_coordinates_traits_3 were written:
@ -663,14 +665,14 @@ insert(InputIterator first, InputIterator beyond,
template <typename Gt, typename Tds> template <typename Gt, typename Tds>
template <typename InputIterator> template <typename InputIterator>
int typename Delaunay_triangulation_on_sphere_2<Gt, Tds>::size_type
Delaunay_triangulation_on_sphere_2<Gt, Tds>:: Delaunay_triangulation_on_sphere_2<Gt, Tds>::
insert(InputIterator first, InputIterator beyond, insert(InputIterator first, InputIterator beyond,
typename std::enable_if< typename std::enable_if<
std::is_same<typename std::iterator_traits<InputIterator>::value_type, std::is_same<typename std::iterator_traits<InputIterator>::value_type,
Point_3>::value>::type*) Point_3>::value>::type*)
{ {
const int n = number_of_vertices(); const size_type n = number_of_vertices();
std::vector<Point_3> points(first, beyond); std::vector<Point_3> points(first, beyond);
CGAL::cpp98::random_shuffle(points.begin(), points.end()); CGAL::cpp98::random_shuffle(points.begin(), points.end());