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

remove unused parameters; int -> ptrdiff_t

This commit is contained in:
Andreas Fabri 2015-01-07 12:05:53 +01:00
parent 65d363408c
commit 8d86f77cbc
4 changed files with 6 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

0
Scripts/scripts/cgal_create_CMakeLists Normal file → Executable file
View File

4
Spatial_searching/include/CGAL/Euclidean_distance.h
View File

@ -108,7 +108,7 @@ namespace CGAL {
} }
//DIM = 2 loop unrolled //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::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); typename SearchTraits::Cartesian_const_iterator_d qit = construct_it(q),pit = construct_it(p);
FT distance = square(*qit - *pit); FT distance = square(*qit - *pit);
@ -118,7 +118,7 @@ namespace CGAL {
} }
//DIM = 3 loop unrolled //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::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); typename SearchTraits::Cartesian_const_iterator_d qit = construct_it(q),pit = construct_it(p);
FT distance = square(*qit - *pit); FT distance = square(*qit - *pit);

4
Spatial_searching/include/CGAL/Kd_tree.h
View File

@ -136,7 +136,7 @@ private:
create_leaf_node(Point_container& c) create_leaf_node(Point_container& c)
{ {
Leaf_node node(true , static_cast<unsigned int>(c.size())); Leaf_node node(true , static_cast<unsigned int>(c.size()));
int tmp = c.begin() - data.begin(); std::ptrdiff_t tmp = c.begin() - data.begin();
node.data = pts.begin() + tmp; node.data = pts.begin() + tmp;
leaf_nodes.push_back(node); leaf_nodes.push_back(node);
@ -286,7 +286,7 @@ public:
ptstmp[i] = *data[i]; ptstmp[i] = *data[i];
} }
for(std::size_t i = 0; i < leaf_nodes.size(); ++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; leaf_nodes[i].data = ptstmp.begin() + tmp;
} }
pts.swap(ptstmp); pts.swap(ptstmp);

4
Spatial_searching/include/CGAL/Kd_tree_rectangle.h
View File

@ -102,7 +102,7 @@ namespace CGAL {
} }
} }
Kd_tree_rectangle(int d) Kd_tree_rectangle(int)
: max_span_coord_(0) : max_span_coord_(0)
{ {
lower_.fill(FT(0)); lower_.fill(FT(0));
@ -142,7 +142,7 @@ namespace CGAL {
} }
template <class Construct_cartesian_const_iterator_d,class PointPointerIter> // was PointIter template <class Construct_cartesian_const_iterator_d,class PointPointerIter> // 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<Construct_cartesian_const_iterator_d>(begin,end,construct_it); update_from_point_pointers<Construct_cartesian_const_iterator_d>(begin,end,construct_it);
} }