import new upstream nautilus stable release 14.2.8

[ceph.git] / ceph / src / boost / boost / geometry / index / detail / rtree / visitors / children_box.hpp

diff --git a/ceph/src/boost/boost/geometry/index/detail/rtree/visitors/children_box.hpp b/ceph/src/boost/boost/geometry/index/detail/rtree/visitors/children_box.hpp
index 6c1bafd3ded8792e27ab79af10cc9f7250cf1ef0..0d26a79c3e80e78e9b1ff5914bfb9cee54db39e1 100644 (file)
--- a/ceph/src/boost/boost/geometry/index/detail/rtree/visitors/children_box.hpp
+++ b/ceph/src/boost/boost/geometry/index/detail/rtree/visitors/children_box.hpp
@@ -4,6 +4,10 @@
 //
 // Copyright (c) 2011-2015 Adam Wulkiewicz, Lodz, Poland.
 //
+// This file was modified by Oracle on 2019.
+// Modifications copyright (c) 2019 Oracle and/or its affiliates.
+// 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
 // http://www.boost.org/LICENSE_1_0.txt)
@@ -19,12 +23,14 @@ template <typename Value, typename Options, typename Translator, typename Box, t
 class children_box
     : public rtree::visitor<Value, typename Options::parameters_type, Box, Allocators, typename Options::node_tag, true>::type
 {
-    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 Options::parameters_type parameters_type;
+
+    typedef typename rtree::internal_node<Value, parameters_type, Box, Allocators, typename Options::node_tag>::type internal_node;
+    typedef typename rtree::leaf<Value, parameters_type, Box, Allocators, typename Options::node_tag>::type leaf;
 
 public:
-    inline children_box(Box & result, Translator const& tr)
-        : m_result(result), m_tr(tr)
+    inline children_box(Box & result, parameters_type const& parameters, Translator const& tr)
+        : m_result(result), m_parameters(parameters), m_tr(tr)
     {}
 
     inline void operator()(internal_node const& n)
@@ -32,7 +38,8 @@ public:
         typedef typename rtree::elements_type<internal_node>::type elements_type;
         elements_type const& elements = rtree::elements(n);
 
-        m_result = rtree::elements_box<Box>(elements.begin(), elements.end(), m_tr);
+        m_result = rtree::elements_box<Box>(elements.begin(), elements.end(), m_tr,
+                                            index::detail::get_strategy(m_parameters));
     }
 
     inline void operator()(leaf const& n)
@@ -40,11 +47,13 @@ public:
         typedef typename rtree::elements_type<leaf>::type elements_type;
         elements_type const& elements = rtree::elements(n);
 
-        m_result = rtree::values_box<Box>(elements.begin(), elements.end(), m_tr);
+        m_result = rtree::values_box<Box>(elements.begin(), elements.end(), m_tr,
+                                          index::detail::get_strategy(m_parameters));
     }
 
 private:
     Box & m_result;
+    parameters_type const& m_parameters;
     Translator const& m_tr;
 };