boost/geometry
2
0
Fork 0
mirror of https://github.com/boostorg/geometry.git synced 2026-02-10 11:32:15 +00:00
Code Issues Projects Releases Wiki Activity

geometry.index: experimental iterative query visitor increment() simplified.

Browse Source 
[SVN r84030]
This commit is contained in:
Adam Wulkiewicz
2013-04-24 12:35:30 +00:00
parent 06e93d3f0e
commit dfd201146b
1 changed files with 11 additions and 12 deletions
Download Patch File Download Diff File Expand all files Collapse all files

23
include/boost/geometry/index/detail/rtree/visitors/spatial_query.hpp
View File

@@ -126,25 +126,24 @@ struct spatial_query_incremental
// if leaf is choosen, move to the next value in leaf
if ( values )
{
for ( ;; ++value_index )
if ( value_index < values->size() )
{
// no more values, clear current leaf
if ( values->size() <= value_index )
{
values = 0;
value_index = 0;
break;
}
// return if next value is found
Value const& v = (*values)[value_index];
if ( index::detail::predicates_check<index::detail::value_tag, 0, predicates_len>(pred, v, tr(v)) )
return;
++value_index;
}
// no more values, clear current leaf
else
{
values = 0;
value_index = 0;
}
}
// move to the next leaf if values aren't set
while ( !values )
// if leaf isn't choosen, move to the next leaf
else
{
// return if there is no more nodes to traverse
if ( internal_stack.empty() )