[Boost-commit] svn:boost r80796 - in sandbox-branches/geometry/index/boost/geometry/extensions/index/rtree: . node

Subject: [Boost-commit] svn:boost r80796 - in sandbox-branches/geometry/index/boost/geometry/extensions/index/rtree: . node
From: adam.wulkiewicz_at_[hidden]
Date: 2012-09-30 19:14:10

Author: awulkiew
Date: 2012-09-30 19:14:09 EDT (Sun, 30 Sep 2012)
New Revision: 80796
URL: http://svn.boost.org/trac/boost/changeset/80796

Log:
cosmetic changes
Text files modified: 
   sandbox-branches/geometry/index/boost/geometry/extensions/index/rtree/node/node_d_mem_dynamic.hpp |     2 +-                                      
   sandbox-branches/geometry/index/boost/geometry/extensions/index/rtree/rtree.hpp                   |    18 +++++++++++++-----                      
   2 files changed, 14 insertions(+), 6 deletions(-)

Modified: sandbox-branches/geometry/index/boost/geometry/extensions/index/rtree/node/node_d_mem_dynamic.hpp
==============================================================================
--- sandbox-branches/geometry/index/boost/geometry/extensions/index/rtree/node/node_d_mem_dynamic.hpp	(original)
+++ sandbox-branches/geometry/index/boost/geometry/extensions/index/rtree/node/node_d_mem_dynamic.hpp	2012-09-30 19:14:09 EDT (Sun, 30 Sep 2012)
@@ -166,7 +166,7 @@
     >::other leaf_allocator_type;
 
     typedef typename allocator_type::template rebind<
-        std::pair<Box, dynamic_node<Value, Parameters, Box, allocators, node_d_mem_dynamic_tag> *>
+        std::pair<Box, typename node<Value, Parameters, Box, allocators, node_d_mem_dynamic_tag>::type *>
     >::other internal_node_elements_allocator_type;
 
     typedef typename allocator_type::template rebind<

Modified: sandbox-branches/geometry/index/boost/geometry/extensions/index/rtree/rtree.hpp
==============================================================================
--- sandbox-branches/geometry/index/boost/geometry/extensions/index/rtree/rtree.hpp	(original)
+++ sandbox-branches/geometry/index/boost/geometry/extensions/index/rtree/rtree.hpp	2012-09-30 19:14:09 EDT (Sun, 30 Sep 2012)
@@ -203,8 +203,6 @@
     */
     inline rtree & operator=(BOOST_COPY_ASSIGN_REF(rtree) src)
     {
-        //TODO use Boost.Container allocator_traits_type::propagate_on_container_move_assignment
-
         if ( this == &src )
             return *this;
 
@@ -213,6 +211,7 @@
         
         m_parameters = src.m_parameters;
         m_translator = src.m_translator;
+        //TODO use Boost.Container allocator_traits_type::propagate_on_container_move_assignment
         //m_allocators = src.m_allocators;
 
         try
@@ -233,8 +232,6 @@
     */
     inline rtree & operator=(BOOST_RV_REF(rtree) src)
     {
-        //TODO use Boost.Container allocator_traits_type::propagate_on_container_move_assignment
-
         if ( this == &src )
             return *this;
 
@@ -243,9 +240,10 @@
 
         m_parameters = src.m_parameters;
         m_translator = src.m_translator;
+        //TODO use Boost.Container allocator_traits_type::propagate_on_container_move_assignment
         //m_allocators = src.m_allocators;
 
-        if ( m_allocators.allocator == src.m_allocators.allocator)
+        if ( m_allocators.allocator == src.m_allocators.allocator )
         {
             m_values_count = src.m_values_count;
             src.m_values_count = 0;
@@ -548,6 +546,16 @@
     }
 
     /*!
+    Returns allocator used by the rtree.
+
+    \return     The allocator.
+    */
+    allocator_type get_allocator() const
+    {
+        return m_allocators.allocator;
+    }
+
+    /*!
     Apply a visitor to the nodes structure in order to perform some operator.
     This function is not a part of the 'official' interface. However it makes
     possible to e.g. draw the tree structure.