From 034bf7ce0a96b8427a7fc651ee3d1032c98b8de1 Mon Sep 17 00:00:00 2001 From: Adam Wulkiewicz Date: Tue, 29 Mar 2011 18:22:56 +0000 Subject: [PATCH] tagstags are now in the index namespace [SVN r70702] --- .../extensions/index/rtree/rstar/choose_next_node.hpp | 8 ++++---- .../geometry/extensions/index/rtree/rstar/insert.hpp | 8 ++++---- .../geometry/extensions/index/rtree/rstar/rstar.hpp | 2 +- .../geometry/extensions/index/rtree/rstar/split.hpp | 6 +++--- .../boost/geometry/extensions/index/rtree/rtree.hpp | 2 +- .../extensions/index/{rtree/rstar => }/tags.hpp | 10 +++++----- 6 files changed, 18 insertions(+), 18 deletions(-) rename include/boost/geometry/extensions/index/{rtree/rstar => }/tags.hpp (61%) diff --git a/include/boost/geometry/extensions/index/rtree/rstar/choose_next_node.hpp b/include/boost/geometry/extensions/index/rtree/rstar/choose_next_node.hpp index bc6cd04ab..6003f380a 100644 --- a/include/boost/geometry/extensions/index/rtree/rstar/choose_next_node.hpp +++ b/include/boost/geometry/extensions/index/rtree/rstar/choose_next_node.hpp @@ -26,9 +26,9 @@ namespace detail { namespace rtree { namespace rstar { template class choose_next_node { - typedef typename rtree::node::type node; - typedef typename rtree::internal_node::type internal_node; - typedef typename rtree::leaf::type leaf; + typedef typename rtree::node::type node; + typedef typename rtree::internal_node::type internal_node; + typedef typename rtree::leaf::type leaf; typedef typename internal_node::children_type children_type; @@ -39,7 +39,7 @@ public: assert(!n.children.empty()); bool has_leaves = boost::apply_visitor( - visitors::is_leaf(), + visitors::is_leaf(), *n.children.front().second); if ( !has_leaves ) diff --git a/include/boost/geometry/extensions/index/rtree/rstar/insert.hpp b/include/boost/geometry/extensions/index/rtree/rstar/insert.hpp index 682247fb4..bedcf0d2a 100644 --- a/include/boost/geometry/extensions/index/rtree/rstar/insert.hpp +++ b/include/boost/geometry/extensions/index/rtree/rstar/insert.hpp @@ -31,11 +31,11 @@ namespace boost { namespace geometry { namespace index { namespace detail { namespace rtree { namespace visitors { template -class insert : public boost::static_visitor<> +class insert : public boost::static_visitor<> { - typedef typename rtree::node::type node; - typedef typename rtree::internal_node::type internal_node; - typedef typename rtree::leaf::type leaf; + typedef typename rtree::node::type node; + typedef typename rtree::internal_node::type internal_node; + typedef typename rtree::leaf::type leaf; public: inline explicit insert(node* & root, Value const& v, size_t min_elements, size_t max_elements, Translator const& t) diff --git a/include/boost/geometry/extensions/index/rtree/rstar/rstar.hpp b/include/boost/geometry/extensions/index/rtree/rstar/rstar.hpp index b4106b341..6f0ee007f 100644 --- a/include/boost/geometry/extensions/index/rtree/rstar/rstar.hpp +++ b/include/boost/geometry/extensions/index/rtree/rstar/rstar.hpp @@ -10,7 +10,7 @@ #ifndef BOOST_GEOMETRY_EXTENSIONS_INDEX_RTREE_RSTAR_RSTAR_HPP #define BOOST_GEOMETRY_EXTENSIONS_INDEX_RTREE_RSTAR_RSTAR_HPP -#include +#include #include #endif // BOOST_GEOMETRY_EXTENSIONS_INDEX_RTREE_RSTAR_RSTAR_HPP diff --git a/include/boost/geometry/extensions/index/rtree/rstar/split.hpp b/include/boost/geometry/extensions/index/rtree/rstar/split.hpp index 2e25ae12b..1c5684e02 100644 --- a/include/boost/geometry/extensions/index/rtree/rstar/split.hpp +++ b/include/boost/geometry/extensions/index/rtree/rstar/split.hpp @@ -264,9 +264,9 @@ struct split_update_data template class split { - typedef typename rtree::node::type node; - typedef typename rtree::internal_node::type internal_node; - typedef typename rtree::leaf::type leaf; + typedef typename rtree::node::type node; + typedef typename rtree::internal_node::type internal_node; + typedef typename rtree::leaf::type leaf; static const size_t dimension = index::traits::dimension::value; diff --git a/include/boost/geometry/extensions/index/rtree/rtree.hpp b/include/boost/geometry/extensions/index/rtree/rtree.hpp index 6a0fae593..7bf35939f 100644 --- a/include/boost/geometry/extensions/index/rtree/rtree.hpp +++ b/include/boost/geometry/extensions/index/rtree/rtree.hpp @@ -27,7 +27,7 @@ namespace boost { namespace geometry { namespace index { template < typename Value, typename Translator = default_parameter, - typename Tag = rtree_rstar_tag + typename Tag = rstar_tag > class rtree { diff --git a/include/boost/geometry/extensions/index/rtree/rstar/tags.hpp b/include/boost/geometry/extensions/index/tags.hpp similarity index 61% rename from include/boost/geometry/extensions/index/rtree/rstar/tags.hpp rename to include/boost/geometry/extensions/index/tags.hpp index b19e29648..6032d3232 100644 --- a/include/boost/geometry/extensions/index/rtree/rstar/tags.hpp +++ b/include/boost/geometry/extensions/index/tags.hpp @@ -1,19 +1,19 @@ // Boost.Geometry (aka GGL, Generic Geometry Library) // -// Boost.Index - R*-tree tags +// 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_RTREE_RSTAR_TAGS_HPP -#define BOOST_GEOMETRY_EXTENSIONS_INDEX_RTREE_RSTAR_TAGS_HPP +#ifndef BOOST_GEOMETRY_EXTENSIONS_INDEX_TAGS_HPP +#define BOOST_GEOMETRY_EXTENSIONS_INDEX_TAGS_HPP namespace boost { namespace geometry { namespace index { -struct rtree_rstar_tag {}; +struct rstar_tag {}; }}} // namespace boost::geometry::index -#endif // BOOST_GEOMETRY_EXTENSIONS_INDEX_RTREE_RSTAR_TAGS_HPP +#endif // BOOST_GEOMETRY_EXTENSIONS_INDEX_TAGS_HPP