From 8f720d178fca53cdb8d148f1e41d032e7e74bc1e Mon Sep 17 00:00:00 2001 From: Andreas Fabri Date: Tue, 22 Jun 2010 10:34:02 +0000 Subject: [PATCH] int -> size_t --- Spatial_searching/include/CGAL/Fuzzy_iso_box.h | 2 +- Spatial_searching/include/CGAL/Kd_tree.h | 4 ++-- Spatial_searching/include/CGAL/Kd_tree_node.h | 6 +++--- 3 files changed, 6 insertions(+), 6 deletions(-) diff --git a/Spatial_searching/include/CGAL/Fuzzy_iso_box.h b/Spatial_searching/include/CGAL/Fuzzy_iso_box.h index 998a499c743..78db33579f7 100644 --- a/Spatial_searching/include/CGAL/Fuzzy_iso_box.h +++ b/Spatial_searching/include/CGAL/Fuzzy_iso_box.h @@ -56,7 +56,7 @@ namespace CGAL { Construct_cartesian_const_iterator_d construct_it; Cartesian_const_iterator_d begin = construct_it(p), end = construct_it(p,1); - dim = end - begin; + dim = static_cast(end - begin); Iso_box_d box = typename SearchTraits::Construct_iso_box_d()(p,q); Construct_min_vertex_d construct_min_vertex_d; diff --git a/Spatial_searching/include/CGAL/Kd_tree.h b/Spatial_searching/include/CGAL/Kd_tree.h index 1e4ba39f70c..a86dae36323 100644 --- a/Spatial_searching/include/CGAL/Kd_tree.h +++ b/Spatial_searching/include/CGAL/Kd_tree.h @@ -85,7 +85,7 @@ private: Node_handle create_leaf_node(Point_container& c) const { - Node_handle nh = nodes.emplace(c.size(), Node::LEAF); + Node_handle nh = nodes.emplace(static_cast(c.size()), Node::LEAF); nh->data = c.begin(); return nh; @@ -191,7 +191,7 @@ public: { const Point_d& p = *pts.begin(); typename SearchTraits::Construct_cartesian_const_iterator_d ccci; - int dim = std::distance(ccci(p), ccci(p,0)); + int dim = static_cast(std::distance(ccci(p), ccci(p,0))); data.reserve(pts.size()); for(unsigned int i = 0; i < pts.size(); i++){ diff --git a/Spatial_searching/include/CGAL/Kd_tree_node.h b/Spatial_searching/include/CGAL/Kd_tree_node.h index e5adcd2279d..d6520a5f424 100644 --- a/Spatial_searching/include/CGAL/Kd_tree_node.h +++ b/Spatial_searching/include/CGAL/Kd_tree_node.h @@ -73,7 +73,7 @@ namespace CGAL { : the_node_type(t) {} - Kd_tree_node(int n_, Node_type t ) + Kd_tree_node(unsigned int n_, Node_type t ) : the_node_type(t), n(n_) {} @@ -163,7 +163,7 @@ namespace CGAL { } - unsigned int + std::size_t num_items() { if (is_leaf()) return size(); @@ -171,7 +171,7 @@ namespace CGAL { return lower()->num_items() + upper()->num_items(); } - unsigned int + std::size_t num_nodes() { if (is_leaf()) return 1;