Subject: [Boost-commit] svn:boost r84752 - trunk/boost/geometry/index
From: adam.wulkiewicz_at_[hidden]
Date: 2013-06-12 19:23:08
Author: awulkiew
Date: 2013-06-12 19:23:08 EDT (Wed, 12 Jun 2013)
New Revision: 84752
URL: http://svn.boost.org/trac/boost/changeset/84752
Log:
[geometry][index]: packing algorithm enabled.
Text files modified:
trunk/boost/geometry/index/rtree.hpp | 27 ---------------------------
1 files changed, 0 insertions(+), 27 deletions(-)
Modified: trunk/boost/geometry/index/rtree.hpp
==============================================================================
--- trunk/boost/geometry/index/rtree.hpp Wed Jun 12 17:05:21 2013 (r84751)
+++ trunk/boost/geometry/index/rtree.hpp 2013-06-12 19:23:08 EDT (Wed, 12 Jun 2013) (r84752)
@@ -239,26 +239,12 @@
allocator_type const& allocator = allocator_type())
: m_members(getter, equal, parameters, allocator)
{
-#ifdef BOOST_GEOMETRY_INDEX_DETAIL_EXPERIMENTAL
typedef detail::rtree::pack<value_type, options_type, translator_type, box_type, allocators_type> pack;
size_type vc = 0, ll = 0;
m_members.root = pack::apply(first, last, vc, ll,
m_members.parameters(), m_members.translator(), m_members.allocators());
m_members.values_count = vc;
m_members.leafs_level = ll;
-#else
-
- BOOST_TRY
- {
- this->insert(first, last);
- }
- BOOST_CATCH(...)
- {
- this->raw_destroy(*this);
- BOOST_RETHROW
- }
- BOOST_CATCH_END
-#endif
}
/*!
@@ -283,25 +269,12 @@
allocator_type const& allocator = allocator_type())
: m_members(getter, equal, parameters, allocator)
{
-#ifdef BOOST_GEOMETRY_INDEX_DETAIL_EXPERIMENTAL
typedef detail::rtree::pack<value_type, options_type, translator_type, box_type, allocators_type> pack;
size_type vc = 0, ll = 0;
m_members.root = pack::apply(::boost::begin(rng), ::boost::end(rng), vc, ll,
m_members.parameters(), m_members.translator(), m_members.allocators());
m_members.values_count = vc;
m_members.leafs_level = ll;
-#else
- BOOST_TRY
- {
- this->insert(rng);
- }
- BOOST_CATCH(...)
- {
- this->raw_destroy(*this);
- BOOST_RETHROW
- }
- BOOST_CATCH_END
-#endif
}
/*!