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

int -> size_type/std::size_t

This commit is contained in:
Andreas Fabri 2010-06-21 15:38:26 +00:00
parent 52b0c5874c
commit 54f913051c
2 changed files with 9 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

10
AABB_tree/include/CGAL/AABB_node.h
View File

@ -63,7 +63,7 @@ public:
template<typename ConstPrimitiveIterator>
void expand(ConstPrimitiveIterator first,
ConstPrimitiveIterator beyond,
const int range);
const std::size_t range);
/**
* @brief General traversal query
@ -78,7 +78,7 @@ public:
template<class Traversal_traits, class Query>
void traversal(const Query& query,
Traversal_traits& traits,
const int nb_primitives) const;
const std::size_t nb_primitives) const;
private:
typedef AABBTraits AABB_traits;
@ -123,7 +123,7 @@ template<typename ConstPrimitiveIterator>
void
AABB_node<Tr>::expand(ConstPrimitiveIterator first,
ConstPrimitiveIterator beyond,
const int range)
const std::size_t range)
{
m_bbox = AABB_traits().compute_bbox_object()(first, beyond);
@ -142,7 +142,7 @@ AABB_node<Tr>::expand(ConstPrimitiveIterator first,
right_child().expand(first+1, beyond, 2);
break;
default:
const int new_range = range/2;
const std::size_t new_range = range/2;
m_p_left_child = static_cast<Node*>(this) + 1;
m_p_right_child = static_cast<Node*>(this) + new_range;
left_child().expand(first, first + new_range, new_range);
@ -156,7 +156,7 @@ template<class Traversal_traits, class Query>
void
AABB_node<Tr>::traversal(const Query& query,
Traversal_traits& traits,
const int nb_primitives) const
const std::size_t nb_primitives) const
{
// Recursive traversal
switch(nb_primitives)

4
AABB_tree/test/AABB_tree/CMakeLists.txt
View File

@ -7,6 +7,10 @@ project(AABB_tests)
CMAKE_MINIMUM_REQUIRED(VERSION 2.4.5)
include_directories(../../include)
include_directories (BEFORE ../../../Number_types/include)
include_directories (BEFORE ../../../Triangulation_2/include)
include_directories (BEFORE ../../../Hash_map/include)
set(CMAKE_ALLOW_LOOSE_LOOP_CONSTRUCTS true)