Subject: [Boost-commit] svn:boost r83703 - in trunk/libs/geometry/test/index: . rtree/exceptions
From: adam.wulkiewicz_at_[hidden]
Date: 2013-04-01 20:12:19
Author: awulkiew
Date: 2013-04-01 20:12:18 EDT (Mon, 01 Apr 2013)
New Revision: 83703
URL: http://svn.boost.org/trac/boost/changeset/83703
Log:
rtree test: added missing Allocators assignment (for throwing nodes).
Text files modified:
trunk/libs/geometry/test/index/geometry_index_test_common.hpp | 8 ++++++++
trunk/libs/geometry/test/index/rtree/exceptions/test_rtree_exceptions.hpp | 19 ++++++++++++++++++-
2 files changed, 26 insertions(+), 1 deletions(-)
Modified: trunk/libs/geometry/test/index/geometry_index_test_common.hpp
==============================================================================
--- trunk/libs/geometry/test/index/geometry_index_test_common.hpp (original)
+++ trunk/libs/geometry/test/index/geometry_index_test_common.hpp 2013-04-01 20:12:18 EDT (Mon, 01 Apr 2013)
@@ -10,6 +10,14 @@
#ifndef GEOMETRY_TEST_GEOMETRY_INDEX_TEST_COMMON_HPP
#define GEOMETRY_TEST_GEOMETRY_INDEX_TEST_COMMON_HPP
+#if defined(_MSC_VER)
+
+//#pragma warning (disable : 4996) // deprecated functions
+//#pragma warning (disable : 4100) // unreferenced formal parameter
+//#pragma warning (disable : 4127) // conditional expression is constant
+
+#endif // _MSC_VER
+
#include <boost/geometry.hpp>
#define BOOST_GEOMETRY_INDEX_DETAIL_ENABLE_DEBUG_INTERFACE
#include <boost/geometry/index/rtree.hpp>
Modified: trunk/libs/geometry/test/index/rtree/exceptions/test_rtree_exceptions.hpp
==============================================================================
--- trunk/libs/geometry/test/index/rtree/exceptions/test_rtree_exceptions.hpp (original)
+++ trunk/libs/geometry/test/index/rtree/exceptions/test_rtree_exceptions.hpp 2013-04-01 20:12:18 EDT (Mon, 01 Apr 2013)
@@ -180,7 +180,8 @@
, leaf_allocator_type()
{}
- inline explicit allocators(Allocator const& alloc)
+ template <typename Alloc>
+ inline explicit allocators(Alloc const& alloc)
: internal_node_allocator_type(alloc)
, leaf_allocator_type(alloc)
{}
@@ -190,6 +191,22 @@
, 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());
+ return *this;
+ }
+
+#ifndef BOOST_NO_CXX11_RVALUE_REFERENCES
+ inline allocators & operator=(allocators const& a)
+ {
+ internal_node_allocator() = a.internal_node_allocator();
+ leaf_allocator() = a.leaf_allocator();
+ return *this;
+ }
+#endif
+
void swap(allocators & a)
{
boost::swap(internal_node_allocator(), a.internal_node_allocator());