Boost-Commit :

Date view	Thread view	Subject view	Author view

Subject: [Boost-commit] svn:boost r70702 - in sandbox-branches/geometry/index_080_new/boost/geometry/extensions/index: . rtree rtree/rstar
From: adam.wulkiewicz_at_[hidden]
Date: 2011-03-29 14:22:58

Author: awulkiew
Date: 2011-03-29 14:22:56 EDT (Tue, 29 Mar 2011)
New Revision: 70702
URL: http://svn.boost.org/trac/boost/changeset/70702

Log:
tagstags are now in the index namespace

Added:
   sandbox-branches/geometry/index_080_new/boost/geometry/extensions/index/tags.hpp (contents, props changed)
Removed:
   sandbox-branches/geometry/index_080_new/boost/geometry/extensions/index/rtree/rstar/tags.hpp
Text files modified:
   sandbox-branches/geometry/index_080_new/boost/geometry/extensions/index/rtree/rstar/choose_next_node.hpp | 8 ++++----
   sandbox-branches/geometry/index_080_new/boost/geometry/extensions/index/rtree/rstar/insert.hpp | 8 ++++----
   sandbox-branches/geometry/index_080_new/boost/geometry/extensions/index/rtree/rstar/rstar.hpp | 2 +-
   sandbox-branches/geometry/index_080_new/boost/geometry/extensions/index/rtree/rstar/split.hpp | 6 +++---
   sandbox-branches/geometry/index_080_new/boost/geometry/extensions/index/rtree/rtree.hpp | 2 +-
   5 files changed, 13 insertions(+), 13 deletions(-)

Modified: sandbox-branches/geometry/index_080_new/boost/geometry/extensions/index/rtree/rstar/choose_next_node.hpp
==============================================================================
--- sandbox-branches/geometry/index_080_new/boost/geometry/extensions/index/rtree/rstar/choose_next_node.hpp (original)
+++ sandbox-branches/geometry/index_080_new/boost/geometry/extensions/index/rtree/rstar/choose_next_node.hpp 2011-03-29 14:22:56 EDT (Tue, 29 Mar 2011)
@@ -26,9 +26,9 @@
template <typename Value, typename Box>
class choose_next_node
{
- typedef typename rtree::node<Value, Box, rtree_rstar_tag>::type node;
- typedef typename rtree::internal_node<Value, Box, rtree_rstar_tag>::type internal_node;
- typedef typename rtree::leaf<Value, Box, rtree_rstar_tag>::type leaf;
+ typedef typename rtree::node<Value, Box, rstar_tag>::type node;
+ typedef typename rtree::internal_node<Value, Box, rstar_tag>::type internal_node;
+ typedef typename rtree::leaf<Value, Box, rstar_tag>::type leaf;

     typedef typename internal_node::children_type children_type;

@@ -39,7 +39,7 @@
         assert(!n.children.empty());

         bool has_leaves = boost::apply_visitor(
- visitors::is_leaf<Value, Box, rtree_rstar_tag>(),
+ visitors::is_leaf<Value, Box, rstar_tag>(),
             *n.children.front().second);

         if ( !has_leaves )

Modified: sandbox-branches/geometry/index_080_new/boost/geometry/extensions/index/rtree/rstar/insert.hpp
==============================================================================
--- sandbox-branches/geometry/index_080_new/boost/geometry/extensions/index/rtree/rstar/insert.hpp (original)
+++ sandbox-branches/geometry/index_080_new/boost/geometry/extensions/index/rtree/rstar/insert.hpp 2011-03-29 14:22:56 EDT (Tue, 29 Mar 2011)
@@ -31,11 +31,11 @@
namespace detail { namespace rtree { namespace visitors {

template <typename Value, typename Translator, typename Box>
-class insert<Value, Translator, Box, rtree_rstar_tag> : public boost::static_visitor<>
+class insert<Value, Translator, Box, rstar_tag> : public boost::static_visitor<>
{
- typedef typename rtree::node<Value, Box, rtree_rstar_tag>::type node;
- typedef typename rtree::internal_node<Value, Box, rtree_rstar_tag>::type internal_node;
- typedef typename rtree::leaf<Value, Box, rtree_rstar_tag>::type leaf;
+ typedef typename rtree::node<Value, Box, rstar_tag>::type node;
+ typedef typename rtree::internal_node<Value, Box, rstar_tag>::type internal_node;
+ typedef typename rtree::leaf<Value, Box, rstar_tag>::type leaf;

public:
inline explicit insert(node* & root, Value const& v, size_t min_elements, size_t max_elements, Translator const& t)

Modified: sandbox-branches/geometry/index_080_new/boost/geometry/extensions/index/rtree/rstar/rstar.hpp
==============================================================================
--- sandbox-branches/geometry/index_080_new/boost/geometry/extensions/index/rtree/rstar/rstar.hpp (original)
+++ sandbox-branches/geometry/index_080_new/boost/geometry/extensions/index/rtree/rstar/rstar.hpp 2011-03-29 14:22:56 EDT (Tue, 29 Mar 2011)
@@ -10,7 +10,7 @@
#ifndef BOOST_GEOMETRY_EXTENSIONS_INDEX_RTREE_RSTAR_RSTAR_HPP
#define BOOST_GEOMETRY_EXTENSIONS_INDEX_RTREE_RSTAR_RSTAR_HPP

-#include <boost/geometry/extensions/index/rtree/rstar/tags.hpp>
+#include <boost/geometry/extensions/index/tags.hpp>
#include <boost/geometry/extensions/index/rtree/rstar/insert.hpp>

#endif // BOOST_GEOMETRY_EXTENSIONS_INDEX_RTREE_RSTAR_RSTAR_HPP

Modified: sandbox-branches/geometry/index_080_new/boost/geometry/extensions/index/rtree/rstar/split.hpp
==============================================================================
--- sandbox-branches/geometry/index_080_new/boost/geometry/extensions/index/rtree/rstar/split.hpp (original)
+++ sandbox-branches/geometry/index_080_new/boost/geometry/extensions/index/rtree/rstar/split.hpp 2011-03-29 14:22:56 EDT (Tue, 29 Mar 2011)
@@ -264,9 +264,9 @@
template <typename Value, typename Translator, typename Box>
class split
{
- typedef typename rtree::node<Value, Box, rtree_rstar_tag>::type node;
- typedef typename rtree::internal_node<Value, Box, rtree_rstar_tag>::type internal_node;
- typedef typename rtree::leaf<Value, Box, rtree_rstar_tag>::type leaf;
+ typedef typename rtree::node<Value, Box, rstar_tag>::type node;
+ typedef typename rtree::internal_node<Value, Box, rstar_tag>::type internal_node;
+ typedef typename rtree::leaf<Value, Box, rstar_tag>::type leaf;

static const size_t dimension = index::traits::dimension<Box>::value;

Deleted: sandbox-branches/geometry/index_080_new/boost/geometry/extensions/index/rtree/rstar/tags.hpp
==============================================================================
--- sandbox-branches/geometry/index_080_new/boost/geometry/extensions/index/rtree/rstar/tags.hpp 2011-03-29 14:22:56 EDT (Tue, 29 Mar 2011)
+++ (empty file)
@@ -1,19 +0,0 @@
-// Boost.Geometry (aka GGL, Generic Geometry Library)
-//
-// Boost.Index - R*-tree tags
-//
-// Copyright 2011 Adam Wulkiewicz.
-// Use, modification and distribution is subject to the Boost Software License,
-// Version 1.0. (See accompanying file LICENSE_1_0.txt or copy at
-// http://www.boost.org/LICENSE_1_0.txt)
-
-#ifndef BOOST_GEOMETRY_EXTENSIONS_INDEX_RTREE_RSTAR_TAGS_HPP
-#define BOOST_GEOMETRY_EXTENSIONS_INDEX_RTREE_RSTAR_TAGS_HPP
-
-namespace boost { namespace geometry { namespace index {
-
-struct rtree_rstar_tag {};
-
-}}} // namespace boost::geometry::index
-
-#endif // BOOST_GEOMETRY_EXTENSIONS_INDEX_RTREE_RSTAR_TAGS_HPP

Modified: sandbox-branches/geometry/index_080_new/boost/geometry/extensions/index/rtree/rtree.hpp
==============================================================================
--- sandbox-branches/geometry/index_080_new/boost/geometry/extensions/index/rtree/rtree.hpp (original)
+++ sandbox-branches/geometry/index_080_new/boost/geometry/extensions/index/rtree/rtree.hpp 2011-03-29 14:22:56 EDT (Tue, 29 Mar 2011)
@@ -27,7 +27,7 @@
template <
typename Value,
typename Translator = default_parameter,
- typename Tag = rtree_rstar_tag
+ typename Tag = rstar_tag
>
class rtree
{

Added: sandbox-branches/geometry/index_080_new/boost/geometry/extensions/index/tags.hpp
==============================================================================
--- (empty file)
+++ sandbox-branches/geometry/index_080_new/boost/geometry/extensions/index/tags.hpp 2011-03-29 14:22:56 EDT (Tue, 29 Mar 2011)
@@ -0,0 +1,19 @@
+// Boost.Geometry (aka GGL, Generic Geometry Library)
+//
+// Boost.Index - R*-tree tag
+//
+// Copyright 2011 Adam Wulkiewicz.
+// Use, modification and distribution is subject to the Boost Software License,
+// Version 1.0. (See accompanying file LICENSE_1_0.txt or copy at
+// http://www.boost.org/LICENSE_1_0.txt)
+
+#ifndef BOOST_GEOMETRY_EXTENSIONS_INDEX_TAGS_HPP
+#define BOOST_GEOMETRY_EXTENSIONS_INDEX_TAGS_HPP
+
+namespace boost { namespace geometry { namespace index {
+
+struct rstar_tag {};
+
+}}} // namespace boost::geometry::index
+
+#endif // BOOST_GEOMETRY_EXTENSIONS_INDEX_TAGS_HPP

Date view	Thread view	Subject view	Author view

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