Subject: [Boost-commit] svn:boost r83655 - in trunk/boost/geometry/index/detail/rtree: node visitors
From: adam.wulkiewicz_at_[hidden]
Date: 2013-03-30 17:34:32
Author: awulkiew
Date: 2013-03-30 17:34:31 EDT (Sat, 30 Mar 2013)
New Revision: 83655
URL: http://svn.boost.org/trac/boost/changeset/83655
Log:
rtree error fixed: Allocators copy/move assignment defined explicitly.
rtree warning fixed: conversion from size_t to Allocators::size_type.
Text files modified:
trunk/boost/geometry/index/detail/rtree/node/node_d_mem_dynamic.hpp | 6 ++++++
trunk/boost/geometry/index/detail/rtree/node/node_d_mem_static.hpp | 6 ++++++
trunk/boost/geometry/index/detail/rtree/node/node_s_mem_dynamic.hpp | 5 +++++
trunk/boost/geometry/index/detail/rtree/node/node_s_mem_static.hpp | 5 +++++
trunk/boost/geometry/index/detail/rtree/visitors/spatial_query.hpp | 4 +++-
5 files changed, 25 insertions(+), 1 deletions(-)
Modified: trunk/boost/geometry/index/detail/rtree/node/node_d_mem_dynamic.hpp
==============================================================================
--- trunk/boost/geometry/index/detail/rtree/node/node_d_mem_dynamic.hpp (original)
+++ trunk/boost/geometry/index/detail/rtree/node/node_d_mem_dynamic.hpp 2013-03-30 17:34:31 EDT (Sat, 30 Mar 2013)
@@ -198,6 +198,12 @@
, leaf_allocator_type(boost::move(a.leaf_allocator()))
{}
+ inline allocators & operator=(BOOST_FWD_REF(allocators) a)
+ {
+ internal_node_allocator() = ::boost::move(a.internal_node_allocator());
+ leaf_allocator() = ::boost::move(a.leaf_allocator());
+ }
+
void swap(allocators & a)
{
boost::swap(internal_node_allocator(), a.internal_node_allocator());
Modified: trunk/boost/geometry/index/detail/rtree/node/node_d_mem_static.hpp
==============================================================================
--- trunk/boost/geometry/index/detail/rtree/node/node_d_mem_static.hpp (original)
+++ trunk/boost/geometry/index/detail/rtree/node/node_d_mem_static.hpp 2013-03-30 17:34:31 EDT (Sat, 30 Mar 2013)
@@ -147,6 +147,12 @@
, leaf_allocator_type(boost::move(a.leaf_allocator()))
{}
+ inline allocators & operator=(BOOST_FWD_REF(allocators) a)
+ {
+ internal_node_allocator() = ::boost::move(a.internal_node_allocator());
+ leaf_allocator() = ::boost::move(a.leaf_allocator());
+ }
+
void swap(allocators & a)
{
boost::swap(internal_node_allocator(), a.internal_node_allocator());
Modified: trunk/boost/geometry/index/detail/rtree/node/node_s_mem_dynamic.hpp
==============================================================================
--- trunk/boost/geometry/index/detail/rtree/node/node_s_mem_dynamic.hpp (original)
+++ trunk/boost/geometry/index/detail/rtree/node/node_s_mem_dynamic.hpp 2013-03-30 17:34:31 EDT (Sat, 30 Mar 2013)
@@ -123,6 +123,11 @@
: node_allocator_type(boost::move(a.node_allocator()))
{}
+ inline allocators & operator=(BOOST_FWD_REF(allocators) a)
+ {
+ node_allocator() = boost::move(a.node_allocator());
+ }
+
void swap(allocators & a)
{
boost::swap(node_allocator(), a.node_allocator());
Modified: trunk/boost/geometry/index/detail/rtree/node/node_s_mem_static.hpp
==============================================================================
--- trunk/boost/geometry/index/detail/rtree/node/node_s_mem_static.hpp (original)
+++ trunk/boost/geometry/index/detail/rtree/node/node_s_mem_static.hpp 2013-03-30 17:34:31 EDT (Sat, 30 Mar 2013)
@@ -121,6 +121,11 @@
: node_allocator_type(boost::move(a.node_allocator()))
{}
+ inline allocators & operator=(BOOST_FWD_REF(allocators) a)
+ {
+ node_allocator() = boost::move(a.node_allocator());
+ }
+
void swap(allocators & a)
{
boost::swap(node_allocator(), a.node_allocator());
Modified: trunk/boost/geometry/index/detail/rtree/visitors/spatial_query.hpp
==============================================================================
--- trunk/boost/geometry/index/detail/rtree/visitors/spatial_query.hpp (original)
+++ trunk/boost/geometry/index/detail/rtree/visitors/spatial_query.hpp 2013-03-30 17:34:31 EDT (Sat, 30 Mar 2013)
@@ -23,6 +23,8 @@
typedef typename rtree::internal_node<Value, typename Options::parameters_type, Box, Allocators, typename Options::node_tag>::type internal_node;
typedef typename rtree::leaf<Value, typename Options::parameters_type, Box, Allocators, typename Options::node_tag>::type leaf;
+ typedef typename Allocators::size_type size_type;
+
static const unsigned predicates_len = index::detail::predicates_length<Predicates>::value;
inline spatial_query(Translator const& t, Predicates const& p, OutIter out_it)
@@ -70,7 +72,7 @@
Predicates pred;
OutIter out_iter;
- size_t found_count;
+ size_type found_count;
};
}}} // namespace detail::rtree::visitors