diff options
Diffstat (limited to 'boost/geometry/index/detail/rtree/node/variant_dynamic.hpp')
| -rw-r--r-- | boost/geometry/index/detail/rtree/node/variant_dynamic.hpp | 28 |
1 files changed, 20 insertions, 8 deletions
diff --git a/boost/geometry/index/detail/rtree/node/variant_dynamic.hpp b/boost/geometry/index/detail/rtree/node/variant_dynamic.hpp index 52b253ccf6..c545a4160a 100644 --- a/boost/geometry/index/detail/rtree/node/variant_dynamic.hpp +++ b/boost/geometry/index/detail/rtree/node/variant_dynamic.hpp @@ -2,7 +2,12 @@ // // R-tree nodes based on Boost.Variant, storing dynamic-size containers // -// Copyright (c) 2011-2018 Adam Wulkiewicz, Lodz, Poland. +// Copyright (c) 2011-2023 Adam Wulkiewicz, Lodz, Poland. +// +// This file was modified by Oracle on 2021-2023. +// Modifications copyright (c) 2021-2023 Oracle and/or its affiliates. +// Contributed and/or modified by Vissarion Fysikopoulos, on behalf of Oracle +// Contributed and/or modified by Adam Wulkiewicz, on behalf of Oracle // // Use, modification and distribution is subject to the Boost Software License, // Version 1.0. (See accompanying file LICENSE_1_0.txt or copy at @@ -11,7 +16,16 @@ #ifndef BOOST_GEOMETRY_INDEX_DETAIL_RTREE_NODE_VARIANT_DYNAMIC_HPP #define BOOST_GEOMETRY_INDEX_DETAIL_RTREE_NODE_VARIANT_DYNAMIC_HPP +#include <boost/container/allocator_traits.hpp> +#include <boost/container/vector.hpp> #include <boost/core/pointer_traits.hpp> +#include <boost/variant/static_visitor.hpp> +#include <boost/variant/variant.hpp> + +#include <boost/geometry/index/detail/rtree/options.hpp> +#include <boost/geometry/index/detail/rtree/node/concept.hpp> +#include <boost/geometry/index/detail/rtree/node/pairs.hpp> +#include <boost/geometry/index/detail/rtree/node/scoped_deallocator.hpp> namespace boost { namespace geometry { namespace index { @@ -130,7 +144,7 @@ private: node_allocator_type // node_allocator_type for consistency with variant_leaf >::template rebind_alloc<Value> value_allocator_type; typedef boost::container::allocator_traits<value_allocator_type> value_allocator_traits; - + public: typedef Allocator allocator_type; @@ -152,23 +166,21 @@ public: : node_allocator_type(alloc) {} - inline allocators(BOOST_FWD_REF(allocators) a) - : node_allocator_type(boost::move(a.node_allocator())) + inline allocators(allocators&& a) + : node_allocator_type(std::move(a.node_allocator())) {} - inline allocators & operator=(BOOST_FWD_REF(allocators) a) + inline allocators & operator=(allocators&& a) { - node_allocator() = boost::move(a.node_allocator()); + node_allocator() = std::move(a.node_allocator()); return *this; } -#ifndef BOOST_NO_CXX11_RVALUE_REFERENCES inline allocators & operator=(allocators const& a) { node_allocator() = a.node_allocator(); return *this; } -#endif void swap(allocators & a) { |