|
|
Boost-Commit : |
Subject: [Boost-commit] svn:boost r85098 - in trunk/boost/geometry/index/detail/rtree: node rstar visitors
From: adam.wulkiewicz_at_[hidden]
Date: 2013-07-21 12:23:06
Author: awulkiew
Date: 2013-07-21 12:23:06 EDT (Sun, 21 Jul 2013)
New Revision: 85098
URL: http://svn.boost.org/trac/boost/changeset/85098
Log:
[geometry][index] internal_node_pointer type removed from Allocators and not used in visitors
Text files modified:
trunk/boost/geometry/index/detail/rtree/node/node_d_mem_dynamic.hpp | 6 +++---
trunk/boost/geometry/index/detail/rtree/node/node_d_mem_static.hpp | 6 +++---
trunk/boost/geometry/index/detail/rtree/node/node_s_mem_dynamic.hpp | 6 +++---
trunk/boost/geometry/index/detail/rtree/node/node_s_mem_static.hpp | 6 +++---
trunk/boost/geometry/index/detail/rtree/rstar/insert.hpp | 4 +++-
trunk/boost/geometry/index/detail/rtree/visitors/insert.hpp | 4 +++-
trunk/boost/geometry/index/detail/rtree/visitors/remove.hpp | 4 +++-
7 files changed, 21 insertions(+), 15 deletions(-)
Modified: trunk/boost/geometry/index/detail/rtree/node/node_d_mem_dynamic.hpp
==============================================================================
--- trunk/boost/geometry/index/detail/rtree/node/node_d_mem_dynamic.hpp Sun Jul 21 00:23:19 2013 (r85097)
+++ trunk/boost/geometry/index/detail/rtree/node/node_d_mem_dynamic.hpp 2013-07-21 12:23:06 EDT (Sun, 21 Jul 2013) (r85098)
@@ -183,9 +183,9 @@
typename node<Value, Parameters, Box, allocators, node_d_mem_dynamic_tag>::type
>::other::pointer node_pointer;
- typedef typename Allocator::template rebind<
- typename internal_node<Value, Parameters, Box, allocators, node_d_mem_dynamic_tag>::type
- >::other::pointer internal_node_pointer;
+// typedef typename Allocator::template rebind<
+// typename internal_node<Value, Parameters, Box, allocators, node_d_mem_dynamic_tag>::type
+// >::other::pointer internal_node_pointer;
typedef typename Allocator::template rebind<
typename internal_node<Value, Parameters, Box, allocators, node_d_mem_dynamic_tag>::type
Modified: trunk/boost/geometry/index/detail/rtree/node/node_d_mem_static.hpp
==============================================================================
--- trunk/boost/geometry/index/detail/rtree/node/node_d_mem_static.hpp Sun Jul 21 00:23:19 2013 (r85097)
+++ trunk/boost/geometry/index/detail/rtree/node/node_d_mem_static.hpp 2013-07-21 12:23:06 EDT (Sun, 21 Jul 2013) (r85098)
@@ -130,9 +130,9 @@
typename node<Value, Parameters, Box, allocators, node_d_mem_static_tag>::type
>::other::pointer node_pointer;
- typedef typename Allocator::template rebind<
- typename internal_node<Value, Parameters, Box, allocators, node_d_mem_static_tag>::type
- >::other::pointer internal_node_pointer;
+// typedef typename Allocator::template rebind<
+// typename internal_node<Value, Parameters, Box, allocators, node_d_mem_static_tag>::type
+// >::other::pointer internal_node_pointer;
typedef typename Allocator::template rebind<
typename internal_node<Value, Parameters, Box, allocators, node_d_mem_static_tag>::type
Modified: trunk/boost/geometry/index/detail/rtree/node/node_s_mem_dynamic.hpp
==============================================================================
--- trunk/boost/geometry/index/detail/rtree/node/node_s_mem_dynamic.hpp Sun Jul 21 00:23:19 2013 (r85097)
+++ trunk/boost/geometry/index/detail/rtree/node/node_s_mem_dynamic.hpp 2013-07-21 12:23:06 EDT (Sun, 21 Jul 2013) (r85098)
@@ -115,9 +115,9 @@
typename node<Value, Parameters, Box, allocators, node_s_mem_dynamic_tag>::type
>::other::pointer node_pointer;
- typedef typename Allocator::template rebind<
- typename internal_node<Value, Parameters, Box, allocators, node_s_mem_dynamic_tag>::type
- >::other::pointer internal_node_pointer;
+// typedef typename Allocator::template rebind<
+// typename internal_node<Value, Parameters, Box, allocators, node_s_mem_dynamic_tag>::type
+// >::other::pointer internal_node_pointer;
typedef typename Allocator::template rebind<
typename node<Value, Parameters, Box, allocators, node_s_mem_dynamic_tag>::type
Modified: trunk/boost/geometry/index/detail/rtree/node/node_s_mem_static.hpp
==============================================================================
--- trunk/boost/geometry/index/detail/rtree/node/node_s_mem_static.hpp Sun Jul 21 00:23:19 2013 (r85097)
+++ trunk/boost/geometry/index/detail/rtree/node/node_s_mem_static.hpp 2013-07-21 12:23:06 EDT (Sun, 21 Jul 2013) (r85098)
@@ -111,9 +111,9 @@
typename node<Value, Parameters, Box, allocators, node_s_mem_static_tag>::type
>::other::pointer node_pointer;
- typedef typename Allocator::template rebind<
- typename internal_node<Value, Parameters, Box, allocators, node_s_mem_static_tag>::type
- >::other::pointer internal_node_pointer;
+// typedef typename Allocator::template rebind<
+// typename internal_node<Value, Parameters, Box, allocators, node_s_mem_static_tag>::type
+// >::other::pointer internal_node_pointer;
typedef typename Allocator::template rebind<
typename node<Value, Parameters, Box, allocators, node_s_mem_static_tag>::type
Modified: trunk/boost/geometry/index/detail/rtree/rstar/insert.hpp
==============================================================================
--- trunk/boost/geometry/index/detail/rtree/rstar/insert.hpp Sun Jul 21 00:23:19 2013 (r85097)
+++ trunk/boost/geometry/index/detail/rtree/rstar/insert.hpp 2013-07-21 12:23:06 EDT (Sun, 21 Jul 2013) (r85098)
@@ -28,7 +28,9 @@
typedef typename rtree::leaf<Value, typename Options::parameters_type, Box, Allocators, typename Options::node_tag>::type leaf;
typedef typename Options::parameters_type parameters_type;
- typedef typename Allocators::internal_node_pointer internal_node_pointer;
+
+ //typedef typename Allocators::internal_node_pointer internal_node_pointer;
+ typedef internal_node * internal_node_pointer;
template <typename ResultElements, typename Node>
static inline void apply(ResultElements & result_elements,
Modified: trunk/boost/geometry/index/detail/rtree/visitors/insert.hpp
==============================================================================
--- trunk/boost/geometry/index/detail/rtree/visitors/insert.hpp Sun Jul 21 00:23:19 2013 (r85097)
+++ trunk/boost/geometry/index/detail/rtree/visitors/insert.hpp 2013-07-21 12:23:06 EDT (Sun, 21 Jul 2013) (r85098)
@@ -231,7 +231,9 @@
typedef rtree::node_auto_ptr<Value, Options, Translator, Box, Allocators> node_auto_ptr;
typedef typename Allocators::node_pointer node_pointer;
- typedef typename Allocators::internal_node_pointer internal_node_pointer;
+
+ //typedef typename Allocators::internal_node_pointer internal_node_pointer;
+ typedef internal_node * internal_node_pointer;
inline insert(node_pointer & root,
size_t & leafs_level,
Modified: trunk/boost/geometry/index/detail/rtree/visitors/remove.hpp
==============================================================================
--- trunk/boost/geometry/index/detail/rtree/visitors/remove.hpp Sun Jul 21 00:23:19 2013 (r85097)
+++ trunk/boost/geometry/index/detail/rtree/visitors/remove.hpp 2013-07-21 12:23:06 EDT (Sun, 21 Jul 2013) (r85098)
@@ -32,7 +32,9 @@
typedef rtree::node_auto_ptr<Value, Options, Translator, Box, Allocators> node_auto_ptr;
typedef typename Allocators::node_pointer node_pointer;
- typedef typename Allocators::internal_node_pointer internal_node_pointer;
+
+ //typedef typename Allocators::internal_node_pointer internal_node_pointer;
+ typedef internal_node * internal_node_pointer;
public:
inline remove(node_pointer & root,
Boost-Commit list run by bdawes at acm.org, david.abrahams at rcn.com, gregod at cs.rpi.edu, cpdaniel at pacbell.net, john at johnmaddock.co.uk