Subject: [Boost-commit] svn:boost r73140 - in sandbox-branches/geometry/index/boost/geometry/extensions/index/rtree: . node
From: adam.wulkiewicz_at_[hidden]
Date: 2011-07-16 05:59:36
Author: awulkiew
Date: 2011-07-16 05:59:35 EDT (Sat, 16 Jul 2011)
New Revision: 73140
URL: http://svn.boost.org/trac/boost/changeset/73140
Log:
node tag names changed
Text files modified:
sandbox-branches/geometry/index/boost/geometry/extensions/index/rtree/node/node_default_static.hpp | 18 +++++++++---------
sandbox-branches/geometry/index/boost/geometry/extensions/index/rtree/node/node_default_variant.hpp | 26 ++++++++++++++------------
sandbox-branches/geometry/index/boost/geometry/extensions/index/rtree/options.hpp | 12 ++++++------
3 files changed, 29 insertions(+), 27 deletions(-)
Modified: sandbox-branches/geometry/index/boost/geometry/extensions/index/rtree/node/node_default_static.hpp
==============================================================================
--- sandbox-branches/geometry/index/boost/geometry/extensions/index/rtree/node/node_default_static.hpp (original)
+++ sandbox-branches/geometry/index/boost/geometry/extensions/index/rtree/node/node_default_static.hpp 2011-07-16 05:59:35 EDT (Sat, 16 Jul 2011)
@@ -17,28 +17,28 @@
namespace detail { namespace rtree {
template <typename Value, typename Parameters, typename Box>
-struct internal_node_poly<Value, Parameters, Box, default_static_tag>
- : public node_poly<Value, Parameters, Box, default_static_tag>
+struct internal_node_poly<Value, Parameters, Box, node_default_static_tag>
+ : public node_poly<Value, Parameters, Box, node_default_static_tag>
{
typedef index::pushable_array<
- std::pair<Box, node_poly<Value, Parameters, Box, default_static_tag> *>,
+ std::pair<Box, node_poly<Value, Parameters, Box, node_default_static_tag> *>,
Parameters::max_elements + 1
> elements_type;
- void apply_visitor(visitor_poly<Value, Parameters, Box, default_static_tag, false> & v) { v(*this); }
- void apply_visitor(visitor_poly<Value, Parameters, Box, default_static_tag, true> & v) const { v(*this); }
+ void apply_visitor(visitor_poly<Value, Parameters, Box, node_default_static_tag, false> & v) { v(*this); }
+ void apply_visitor(visitor_poly<Value, Parameters, Box, node_default_static_tag, true> & v) const { v(*this); }
elements_type elements;
};
template <typename Value, typename Parameters, typename Box>
-struct leaf_poly<Value, Parameters, Box, default_static_tag>
- : public node_poly<Value, Parameters, Box, default_static_tag>
+struct leaf_poly<Value, Parameters, Box, node_default_static_tag>
+ : public node_poly<Value, Parameters, Box, node_default_static_tag>
{
typedef index::pushable_array<Value, Parameters::max_elements + 1> elements_type;
- void apply_visitor(visitor_poly<Value, Parameters, Box, default_static_tag, false> & v) { v(*this); }
- void apply_visitor(visitor_poly<Value, Parameters, Box, default_static_tag, true> & v) const { v(*this); }
+ void apply_visitor(visitor_poly<Value, Parameters, Box, node_default_static_tag, false> & v) { v(*this); }
+ void apply_visitor(visitor_poly<Value, Parameters, Box, node_default_static_tag, true> & v) const { v(*this); }
elements_type elements;
};
Modified: sandbox-branches/geometry/index/boost/geometry/extensions/index/rtree/node/node_default_variant.hpp
==============================================================================
--- sandbox-branches/geometry/index/boost/geometry/extensions/index/rtree/node/node_default_variant.hpp (original)
+++ sandbox-branches/geometry/index/boost/geometry/extensions/index/rtree/node/node_default_variant.hpp 2011-07-16 05:59:35 EDT (Sat, 16 Jul 2011)
@@ -42,24 +42,24 @@
// nodes traits
template <typename Value, typename Parameters, typename Box>
-struct node<Value, Parameters, Box, default_variant_tag>
+struct node<Value, Parameters, Box, node_default_variant_tag>
{
typedef boost::variant<
- leaf_variant<Value, Parameters, Box, default_variant_tag>,
- internal_node_variant<Value, Parameters, Box, default_variant_tag>
+ leaf_variant<Value, Parameters, Box, node_default_variant_tag>,
+ internal_node_variant<Value, Parameters, Box, node_default_variant_tag>
> type;
};
template <typename Value, typename Parameters, typename Box>
-struct internal_node<Value, Parameters, Box, default_variant_tag>
+struct internal_node<Value, Parameters, Box, node_default_variant_tag>
{
- typedef internal_node_variant<Value, Parameters, Box, default_variant_tag> type;
+ typedef internal_node_variant<Value, Parameters, Box, node_default_variant_tag> type;
};
template <typename Value, typename Parameters, typename Box>
-struct leaf<Value, Parameters, Box, default_variant_tag>
+struct leaf<Value, Parameters, Box, node_default_variant_tag>
{
- typedef leaf_variant<Value, Parameters, Box, default_variant_tag> type;
+ typedef leaf_variant<Value, Parameters, Box, node_default_variant_tag> type;
};
// nodes conversion
@@ -76,10 +76,12 @@
}
template <typename V, typename Value, typename Parameters, typename Box, typename Tag>
-inline V * get(boost::variant<
- leaf_variant<Value, Parameters, Box, Tag>,
- internal_node_variant<Value, Parameters, Box, Tag>
- > *v)
+inline V * get(
+ boost::variant<
+ leaf_variant<Value, Parameters, Box, Tag>,
+ internal_node_variant<Value, Parameters, Box, Tag>
+ > *v
+)
{
return boost::get<V>(v);
}
@@ -87,7 +89,7 @@
// visitor traits
template <typename Value, typename Parameters, typename Box, bool IsVisitableConst>
-struct visitor<Value, Parameters, Box, default_variant_tag, IsVisitableConst>
+struct visitor<Value, Parameters, Box, node_default_variant_tag, IsVisitableConst>
{
typedef static_visitor<> type;
};
Modified: sandbox-branches/geometry/index/boost/geometry/extensions/index/rtree/options.hpp
==============================================================================
--- sandbox-branches/geometry/index/boost/geometry/extensions/index/rtree/options.hpp (original)
+++ sandbox-branches/geometry/index/boost/geometry/extensions/index/rtree/options.hpp 2011-07-16 05:59:35 EDT (Sat, 16 Jul 2011)
@@ -26,9 +26,9 @@
struct rstar_tag {};
// NodeTag
-struct default_tag {};
-struct default_variant_tag {};
-struct default_static_tag {};
+struct node_default_tag {};
+struct node_default_variant_tag {};
+struct node_default_static_tag {};
// TODO: awulkiew - implement those:
//if ( m_min_elems_per_node < 1 )
@@ -115,7 +115,7 @@
insert_tag,
choose_by_content_diff_tag,
linear_tag,
- default_tag
+ node_default_tag
> type;
};
@@ -127,7 +127,7 @@
insert_tag,
choose_by_content_diff_tag,
quadratic_tag,
- default_tag
+ node_default_tag
> type;
};
@@ -139,7 +139,7 @@
reinsert_tag,
choose_by_overlap_diff_tag,
rstar_tag,
- default_tag
+ node_default_tag
> type;
};