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

Subject: [Boost-commit] svn:boost r80794 - sandbox-branches/geometry/index/boost/geometry/extensions/index/rtree/node
From: adam.wulkiewicz_at_[hidden]
Date: 2012-09-30 16:28:12

Author: awulkiew
Date: 2012-09-30 16:28:11 EDT (Sun, 30 Sep 2012)
New Revision: 80794
URL: http://svn.boost.org/trac/boost/changeset/80794

Log:
some names changed.
Text files modified: 
   sandbox-branches/geometry/index/boost/geometry/extensions/index/rtree/node/node_d_mem_dynamic.hpp |     6 +++---                                  
   sandbox-branches/geometry/index/boost/geometry/extensions/index/rtree/node/node_s_mem_dynamic.hpp |    24 ++++++++++++------------                
   sandbox-branches/geometry/index/boost/geometry/extensions/index/rtree/node/node_s_mem_static.hpp  |     4 ++--                                    
   3 files changed, 17 insertions(+), 17 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 16:28:11 EDT (Sun, 30 Sep 2012)
@@ -218,7 +218,7 @@
 // destroy_node_impl
 
 template <typename Node>
-struct destroy_node_poly
+struct destroy_dynamic_node
 {
     template <typename AllocNode, typename BaseNode>
     static inline void apply(AllocNode & alloc_node, BaseNode * n)
@@ -273,7 +273,7 @@
 {
     static inline void apply(Allocators & allocators, dynamic_node<Value, Parameters, Box, Allocators, Tag> * n)
     {
-        destroy_node_poly<
+        destroy_dynamic_node<
             dynamic_internal_node<Value, Parameters, Box, Allocators, Tag>
         >::apply(allocators.internal_node_allocator, n);
     }
@@ -287,7 +287,7 @@
 {
     static inline void apply(Allocators & allocators, dynamic_node<Value, Parameters, Box, Allocators, Tag> * n)
     {
-        destroy_node_poly<
+        destroy_dynamic_node<
             dynamic_leaf<Value, Parameters, Box, Allocators, Tag>
         >::apply(allocators.leaf_allocator, n);
     }

Modified: sandbox-branches/geometry/index/boost/geometry/extensions/index/rtree/node/node_s_mem_dynamic.hpp
==============================================================================
--- sandbox-branches/geometry/index/boost/geometry/extensions/index/rtree/node/node_s_mem_dynamic.hpp	(original)
+++ sandbox-branches/geometry/index/boost/geometry/extensions/index/rtree/node/node_s_mem_dynamic.hpp	2012-09-30 16:28:11 EDT (Sun, 30 Sep 2012)
@@ -153,20 +153,20 @@
 
 // create_node_variant
 
-template <typename RetNode, typename Node>
-struct create_node_variant
+template <typename Variant, typename Node>
+struct create_static_node
 {
     template <typename AllocNode, typename AllocElems>
-    static inline RetNode * apply(AllocNode & alloc_node, AllocElems & alloc_elems)
+    static inline Variant * apply(AllocNode & alloc_node, AllocElems & alloc_elems)
     {
-        RetNode * p = alloc_node.allocate(1);
+        Variant * p = alloc_node.allocate(1);
 
         if ( 0 == p )
             throw std::bad_alloc();
 
         try
         {
-            alloc_node.construct(p, Node(alloc_elems));
+            alloc_node.construct(p, Node(alloc_elems)); // implicit cast to Variant
         }
         catch(...)
         {
@@ -181,10 +181,10 @@
 // destroy_node_variant
 
 template <typename Node>
-struct destroy_node_variant
+struct destroy_static_node
 {
-    template <typename AllocNode, typename BaseNode>
-    static inline void apply(AllocNode & alloc_node, BaseNode * n)
+    template <typename AllocNode, typename Variant>
+    static inline void apply(AllocNode & alloc_node, Variant * n)
     {
         alloc_node.destroy(n);
         alloc_node.deallocate(n, 1);
@@ -202,7 +202,7 @@
     static inline typename node<Value, Parameters, Box, Allocators, Tag>::type *
     apply(Allocators & allocators)
     {
-        return create_node_variant<
+        return create_static_node<
             typename node<Value, Parameters, Box, Allocators, Tag>::type,
             static_internal_node<Value, Parameters, Box, Allocators, Tag>
         >::template apply(allocators.node_allocator, allocators.internal_node_elements_allocator);
@@ -218,7 +218,7 @@
     static inline typename node<Value, Parameters, Box, Allocators, Tag>::type *
     apply(Allocators & allocators)
     {
-        return create_node_variant<
+        return create_static_node<
             typename node<Value, Parameters, Box, Allocators, Tag>::type,
             static_leaf<Value, Parameters, Box, Allocators, Tag>
         >::template apply(allocators.node_allocator, allocators.leaf_elements_allocator);
@@ -235,7 +235,7 @@
 {
     static inline void apply(Allocators & allocators, typename node<Value, Parameters, Box, Allocators, Tag>::type * n)
     {
-        destroy_node_variant<
+        destroy_static_node<
             static_internal_node<Value, Parameters, Box, Allocators, Tag>
         >::apply(allocators.node_allocator, n);
     }
@@ -249,7 +249,7 @@
 {
     static inline void apply(Allocators & allocators, typename node<Value, Parameters, Box, Allocators, Tag>::type * n)
     {
-        destroy_node_variant<
+        destroy_static_node<
             static_leaf<Value, Parameters, Box, Allocators, Tag>
         >::apply(allocators.node_allocator, n);
     }

Modified: sandbox-branches/geometry/index/boost/geometry/extensions/index/rtree/node/node_s_mem_static.hpp
==============================================================================
--- sandbox-branches/geometry/index/boost/geometry/extensions/index/rtree/node/node_s_mem_static.hpp	(original)
+++ sandbox-branches/geometry/index/boost/geometry/extensions/index/rtree/node/node_s_mem_static.hpp	2012-09-30 16:28:11 EDT (Sun, 30 Sep 2012)
@@ -120,7 +120,7 @@
     static inline typename node<Value, Parameters, Box, Allocators, node_s_mem_static_tag>::type *
     apply(Allocators & allocators)
     {
-        return create_node_variant<
+        return create_static_node<
             typename node<Value, Parameters, Box, Allocators, node_s_mem_static_tag>::type,
             static_internal_node<Value, Parameters, Box, Allocators, node_s_mem_static_tag>
         >::template apply(allocators.node_allocator, allocators.node_allocator);
@@ -136,7 +136,7 @@
     static inline typename node<Value, Parameters, Box, Allocators, node_s_mem_static_tag>::type *
     apply(Allocators & allocators)
     {
-        return create_node_variant<
+        return create_static_node<
             typename node<Value, Parameters, Box, Allocators, node_s_mem_static_tag>::type,
             static_leaf<Value, Parameters, Box, Allocators, node_s_mem_static_tag>
         >::template apply(allocators.node_allocator, allocators.node_allocator);