import new upstream nautilus stable release 14.2.8

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

diff --git a/ceph/src/boost/boost/geometry/index/detail/rtree/visitors/remove.hpp b/ceph/src/boost/boost/geometry/index/detail/rtree/visitors/remove.hpp
index 7e6162a6163880917f28c8451f86ffd84193aa0b..1a3ccd79655be2f6cebd4aeafe97ddea89cc00d5 100644 (file)
--- a/ceph/src/boost/boost/geometry/index/detail/rtree/visitors/remove.hpp
+++ b/ceph/src/boost/boost/geometry/index/detail/rtree/visitors/remove.hpp
@@ -4,6 +4,10 @@
 //
 // Copyright (c) 2011-2017 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)
@@ -71,9 +75,9 @@ public:
         internal_size_type child_node_index = 0;
         for ( ; child_node_index < children.size() ; ++child_node_index )
         {
-            if ( geometry::covered_by(
-                    return_ref_or_bounds(m_translator(m_value)),
-                    children[child_node_index].first) )
+            if ( index::detail::covered_by_bounds(m_translator(m_value),
+                                                  children[child_node_index].first,
+                                                  index::detail::get_strategy(m_parameters)) )
             {
                 // next traversing step
                 traverse_apply_visitor(n, child_node_index);                                                            // MAY THROW
@@ -112,7 +116,8 @@ public:
                 BOOST_GEOMETRY_INDEX_ASSERT((elements.size() < m_parameters.get_min_elements()) == m_is_underflow, "unexpected state");
 
                 rtree::elements(*m_parent)[m_current_child_index].first
-                    = rtree::elements_box<Box>(elements.begin(), elements.end(), m_translator);
+                    = rtree::elements_box<Box>(elements.begin(), elements.end(), m_translator,
+                                               index::detail::get_strategy(m_parameters));
             }
             // n is root node
             else
@@ -145,11 +150,11 @@ public:
     {
         typedef typename rtree::elements_type<leaf>::type elements_type;
         elements_type & elements = rtree::elements(n);
-
+        
         // find value and remove it
         for ( typename elements_type::iterator it = elements.begin() ; it != elements.end() ; ++it )
         {
-            if ( m_translator.equals(*it, m_value) )
+            if ( m_translator.equals(*it, m_value, index::detail::get_strategy(m_parameters)) )
             {
                 rtree::move_from_back(elements, it);                                                           // MAY THROW (V: copy)
                 elements.pop_back();
@@ -170,7 +175,8 @@ public:
             if ( 0 != m_parent )
             {
                 rtree::elements(*m_parent)[m_current_child_index].first
-                    = rtree::values_box<Box>(elements.begin(), elements.end(), m_translator);
+                    = rtree::values_box<Box>(elements.begin(), elements.end(), m_translator,
+                                             index::detail::get_strategy(m_parameters));
             }
         }
     }