boost/geometry
2
0
Fork 0
mirror of https://github.com/boostorg/geometry.git synced 2026-02-13 00:22:10 +00:00
Code Issues Projects Releases Wiki Activity

tagstags are now in the index namespace

Browse Source 
[SVN r70702]
This commit is contained in:
Adam Wulkiewicz
2011-03-29 18:22:56 +00:00
parent 9c2ff58818
commit 034bf7ce0a
6 changed files with 18 additions and 18 deletions
Download Patch File Download Diff File Expand all files Collapse all files

8
include/boost/geometry/extensions/index/rtree/rstar/choose_next_node.hpp
View File

@@ -26,9 +26,9 @@ namespace detail { namespace rtree { namespace rstar {
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 @@ public:
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 )

8
include/boost/geometry/extensions/index/rtree/rstar/insert.hpp
View File

@@ -31,11 +31,11 @@ namespace boost { namespace geometry { namespace index {
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)

2
include/boost/geometry/extensions/index/rtree/rstar/rstar.hpp
View File

@@ -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

6
include/boost/geometry/extensions/index/rtree/rstar/split.hpp
View File

@@ -264,9 +264,9 @@ struct split_update_data<Value, Translator, Box, 1>
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;

2
include/boost/geometry/extensions/index/rtree/rtree.hpp
View File

@@ -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
{

10
include/boost/geometry/extensions/index/rtree/rstar/tags.hpp → include/boost/geometry/extensions/index/tags.hpp
View File

@@ -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