From 8d86f77cbc33e96bf98ee33b6a16ea984611d82f Mon Sep 17 00:00:00 2001 From: Andreas Fabri Date: Wed, 7 Jan 2015 12:05:53 +0100 Subject: [PATCH] remove unused parameters; int -> ptrdiff_t --- Scripts/scripts/cgal_create_CMakeLists | 0 Spatial_searching/include/CGAL/Euclidean_distance.h | 4 ++-- Spatial_searching/include/CGAL/Kd_tree.h | 4 ++-- Spatial_searching/include/CGAL/Kd_tree_rectangle.h | 4 ++-- 4 files changed, 6 insertions(+), 6 deletions(-) mode change 100644 => 100755 Scripts/scripts/cgal_create_CMakeLists diff --git a/Scripts/scripts/cgal_create_CMakeLists b/Scripts/scripts/cgal_create_CMakeLists old mode 100644 new mode 100755 diff --git a/Spatial_searching/include/CGAL/Euclidean_distance.h b/Spatial_searching/include/CGAL/Euclidean_distance.h index cd5513a3281..0654cacd0af 100644 --- a/Spatial_searching/include/CGAL/Euclidean_distance.h +++ b/Spatial_searching/include/CGAL/Euclidean_distance.h @@ -108,7 +108,7 @@ namespace CGAL { } //DIM = 2 loop unrolled - inline FT transformed_distance(const Query_item& q, const Point_d& p, Dimension_tag<2> dt) const { + inline FT transformed_distance(const Query_item& q, const Point_d& p, Dimension_tag<2> ) const { typename SearchTraits::Construct_cartesian_const_iterator_d construct_it=traits.construct_cartesian_const_iterator_d_object(); typename SearchTraits::Cartesian_const_iterator_d qit = construct_it(q),pit = construct_it(p); FT distance = square(*qit - *pit); @@ -118,7 +118,7 @@ namespace CGAL { } //DIM = 3 loop unrolled - inline FT transformed_distance(const Query_item& q, const Point_d& p, Dimension_tag<3> dt) const { + inline FT transformed_distance(const Query_item& q, const Point_d& p, Dimension_tag<3> ) const { typename SearchTraits::Construct_cartesian_const_iterator_d construct_it=traits.construct_cartesian_const_iterator_d_object(); typename SearchTraits::Cartesian_const_iterator_d qit = construct_it(q),pit = construct_it(p); FT distance = square(*qit - *pit); diff --git a/Spatial_searching/include/CGAL/Kd_tree.h b/Spatial_searching/include/CGAL/Kd_tree.h index b38dc56ed5f..da122cef93a 100644 --- a/Spatial_searching/include/CGAL/Kd_tree.h +++ b/Spatial_searching/include/CGAL/Kd_tree.h @@ -136,7 +136,7 @@ private: create_leaf_node(Point_container& c) { Leaf_node node(true , static_cast(c.size())); - int tmp = c.begin() - data.begin(); + std::ptrdiff_t tmp = c.begin() - data.begin(); node.data = pts.begin() + tmp; leaf_nodes.push_back(node); @@ -286,7 +286,7 @@ public: ptstmp[i] = *data[i]; } for(std::size_t i = 0; i < leaf_nodes.size(); ++i){ - int tmp = leaf_nodes[i].begin() - pts.begin(); + std::ptrdiff_t tmp = leaf_nodes[i].begin() - pts.begin(); leaf_nodes[i].data = ptstmp.begin() + tmp; } pts.swap(ptstmp); diff --git a/Spatial_searching/include/CGAL/Kd_tree_rectangle.h b/Spatial_searching/include/CGAL/Kd_tree_rectangle.h index 53afc2b4541..fa958652b47 100644 --- a/Spatial_searching/include/CGAL/Kd_tree_rectangle.h +++ b/Spatial_searching/include/CGAL/Kd_tree_rectangle.h @@ -102,7 +102,7 @@ namespace CGAL { } } - Kd_tree_rectangle(int d) + Kd_tree_rectangle(int) : max_span_coord_(0) { lower_.fill(FT(0)); @@ -142,7 +142,7 @@ namespace CGAL { } template // was PointIter - Kd_tree_rectangle(int d, PointPointerIter begin, PointPointerIter end,const Construct_cartesian_const_iterator_d& construct_it) + Kd_tree_rectangle(int, PointPointerIter begin, PointPointerIter end,const Construct_cartesian_const_iterator_d& construct_it) { update_from_point_pointers(begin,end,construct_it); }