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

rtree error fixed: Allocators copy/move assignment defined explicitly.

Browse Source 
rtree warning fixed: conversion from size_t to Allocators::size_type.

[SVN r83655]
This commit is contained in:
Adam Wulkiewicz
2013-03-30 21:34:31 +00:00
parent 954dc1dc6e
commit cd7109025c
5 changed files with 25 additions and 1 deletions
Download Patch File Download Diff File Expand all files Collapse all files

6
include/boost/geometry/index/detail/rtree/node/node_d_mem_dynamic.hpp
View File

@@ -198,6 +198,12 @@ public:
, 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());

6
include/boost/geometry/index/detail/rtree/node/node_d_mem_static.hpp
View File

@@ -147,6 +147,12 @@ public:
, 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());

5
include/boost/geometry/index/detail/rtree/node/node_s_mem_dynamic.hpp
View File

@@ -123,6 +123,11 @@ public:
: 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());

5
include/boost/geometry/index/detail/rtree/node/node_s_mem_static.hpp
View File

@@ -121,6 +121,11 @@ public:
: 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());

4
include/boost/geometry/index/detail/rtree/visitors/spatial_query.hpp
View File

@@ -23,6 +23,8 @@ struct spatial_query
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 @@ struct spatial_query
Predicates pred;
OutIter out_iter;
size_t found_count;
size_type found_count;
};
}}} // namespace detail::rtree::visitors