diff options
| author | DongHun Kwak <dh0128.kwak@samsung.com> | 2017-09-13 11:24:46 +0900 |
|---|---|---|
| committer | DongHun Kwak <dh0128.kwak@samsung.com> | 2017-09-13 11:25:39 +0900 |
| commit | 4fadd968fa12130524c8380f33fcfe25d4de79e5 (patch) | |
| tree | fd26a490cd15388d42fc6652b3c5c13012e7f93e /boost/geometry/index/detail/rtree | |
| parent | b5c87084afaef42b2d058f68091be31988a6a874 (diff) | |
| download | boost-upstream/1.65.0.tar.gz boost-upstream/1.65.0.tar.bz2 boost-upstream/1.65.0.zip | |
Imported Upstream version 1.65.0upstream/1.65.0
Change-Id: Icf8400b375482cb11bcf77440a6934ba360d6ba4
Signed-off-by: DongHun Kwak <dh0128.kwak@samsung.com>
Diffstat (limited to 'boost/geometry/index/detail/rtree')
3 files changed, 6 insertions, 4 deletions
diff --git a/boost/geometry/index/detail/rtree/node/variant_dynamic.hpp b/boost/geometry/index/detail/rtree/node/variant_dynamic.hpp index 8e052e5216..e63cfd39ac 100644 --- a/boost/geometry/index/detail/rtree/node/variant_dynamic.hpp +++ b/boost/geometry/index/detail/rtree/node/variant_dynamic.hpp @@ -11,6 +11,8 @@ #ifndef BOOST_GEOMETRY_INDEX_DETAIL_RTREE_NODE_VARIANT_DYNAMIC_HPP #define BOOST_GEOMETRY_INDEX_DETAIL_RTREE_NODE_VARIANT_DYNAMIC_HPP +#include <boost/core/pointer_traits.hpp> + namespace boost { namespace geometry { namespace index { namespace detail { namespace rtree { @@ -183,7 +185,7 @@ struct create_variant_node scoped_deallocator<AllocNode> deallocator(p, alloc_node); - Al::construct(alloc_node, boost::addressof(*p), Node(alloc_node)); // implicit cast to Variant + Al::construct(alloc_node, boost::pointer_traits<P>::to_address(p), Node(alloc_node)); // implicit cast to Variant deallocator.release(); return p; diff --git a/boost/geometry/index/detail/rtree/node/weak_dynamic.hpp b/boost/geometry/index/detail/rtree/node/weak_dynamic.hpp index d49e347826..05fef59e52 100644 --- a/boost/geometry/index/detail/rtree/node/weak_dynamic.hpp +++ b/boost/geometry/index/detail/rtree/node/weak_dynamic.hpp @@ -199,7 +199,7 @@ struct create_weak_node scoped_deallocator<AllocNode> deallocator(p, alloc_node); - Al::construct(alloc_node, boost::addressof(*p), alloc_node); + Al::construct(alloc_node, boost::pointer_traits<P>::to_address(p), alloc_node); deallocator.release(); return p; diff --git a/boost/geometry/index/detail/rtree/visitors/remove.hpp b/boost/geometry/index/detail/rtree/visitors/remove.hpp index 6326f87db6..7e6162a616 100644 --- a/boost/geometry/index/detail/rtree/visitors/remove.hpp +++ b/boost/geometry/index/detail/rtree/visitors/remove.hpp @@ -2,7 +2,7 @@ // // R-tree removing visitor implementation // -// Copyright (c) 2011-2015 Adam Wulkiewicz, Lodz, Poland. +// Copyright (c) 2011-2017 Adam Wulkiewicz, Lodz, Poland. // // Use, modification and distribution is subject to the Boost Software License, // Version 1.0. (See accompanying file LICENSE_1_0.txt or copy at @@ -13,7 +13,7 @@ #include <boost/geometry/index/detail/rtree/visitors/is_leaf.hpp> -#include <boost/geometry/algorithms/covered_by.hpp> +#include <boost/geometry/algorithms/detail/covered_by/interface.hpp> namespace boost { namespace geometry { namespace index { |