Subject: [Boost-commit] svn:boost r84100 - trunk/libs/geometry/index/example
From: adam.wulkiewicz_at_[hidden]
Date: 2013-05-01 10:23:23
Author: awulkiew
Date: 2013-05-01 10:23:22 EDT (Wed, 01 May 2013)
New Revision: 84100
URL: http://svn.boost.org/trac/boost/changeset/84100
Log:
geometry.index example: type-erased iterator defined in rtree used in benchmark_experimental.
Text files modified:
trunk/libs/geometry/index/example/benchmark_experimental.cpp | 24 ++++--------------------
1 files changed, 4 insertions(+), 20 deletions(-)
Modified: trunk/libs/geometry/index/example/benchmark_experimental.cpp
==============================================================================
--- trunk/libs/geometry/index/example/benchmark_experimental.cpp (original)
+++ trunk/libs/geometry/index/example/benchmark_experimental.cpp 2013-05-01 10:23:22 EDT (Wed, 01 May 2013)
@@ -24,22 +24,6 @@
typedef bg::model::point<double, 2, bg::cs::cartesian> P;
typedef bg::model::box<P> B;
-#ifdef BOOST_GEOMETRY_INDEX_DETAIL_ENABLE_TYPE_ERASED_ITERATORS
-
-#include <boost/type_erasure/iterator.hpp>
-
-typedef boost::type_erasure::any<
- boost::type_erasure::iterator<
- boost::single_pass_traversal_tag,
- boost::type_erasure::_self,
- B const&,
- std::ptrdiff_t,
- const B
- >
-> iterator;
-
-#endif
-
int main()
{
typedef boost::chrono::thread_clock clock_t;
@@ -140,8 +124,8 @@
float x = coords[i].first;
float y = coords[i].second;
result.clear();
- iterator first = t.qbegin(bgi::intersects(B(P(x - 10, y - 10), P(x + 10, y + 10))));
- iterator last = t.qend(bgi::intersects(B(P(x - 10, y - 10), P(x + 10, y + 10))));
+ RT::const_query_iterator first = t.qbegin(bgi::intersects(B(P(x - 10, y - 10), P(x + 10, y + 10))));
+ RT::const_query_iterator last = t.qend(bgi::intersects(B(P(x - 10, y - 10), P(x + 10, y + 10))));
std::copy(first, last, std::back_inserter(result));
temp += result.size();
}
@@ -220,8 +204,8 @@
float x = coords[i].first;
float y = coords[i].second;
result.clear();
- iterator first = t.qbegin(bgi::nearest(P(x, y), neighbours_count));
- iterator last = t.qend(bgi::nearest(P(x, y), neighbours_count));
+ RT::const_query_iterator first = t.qbegin(bgi::nearest(P(x, y), neighbours_count));
+ RT::const_query_iterator last = t.qend(bgi::nearest(P(x, y), neighbours_count));
std::copy(first, last, std::back_inserter(result));
temp += result.size();
}