import new upstream nautilus stable release 14.2.8

[ceph.git] / ceph / src / boost / boost / geometry / strategies / cartesian / disjoint_segment_box.hpp

diff --git a/ceph/src/boost/boost/geometry/strategies/cartesian/disjoint_segment_box.hpp b/ceph/src/boost/boost/geometry/strategies/cartesian/disjoint_segment_box.hpp
index 4da4bc4503bf92df1f9cc7c66e1dac3e2044fb1a..37ae77f2b8daec0814da2a954b23db2ecb38ac60 100644 (file)
--- a/ceph/src/boost/boost/geometry/strategies/cartesian/disjoint_segment_box.hpp
+++ b/ceph/src/boost/boost/geometry/strategies/cartesian/disjoint_segment_box.hpp
@@ -5,8 +5,8 @@
 // Copyright (c) 2009-2014 Mateusz Loskot, London, UK.
 // Copyright (c) 2013-2014 Adam Wulkiewicz, Lodz, Poland.
 
-// This file was modified by Oracle on 2013-2017.
-// Modifications copyright (c) 2013-2017, Oracle and/or its affiliates.
+// This file was modified by Oracle on 2013-2019.
+// Modifications copyright (c) 2013-2019, Oracle and/or its affiliates.
 
 // Contributed and/or modified by Vissarion Fysikopoulos, on behalf of Oracle
 // Contributed and/or modified by Menelaos Karavelas, on behalf of Oracle
@@ -35,6 +35,7 @@
 
 #include <boost/geometry/algorithms/detail/assign_indexed_point.hpp>
 
+#include <boost/geometry/strategies/cartesian/point_in_box.hpp>
 #include <boost/geometry/strategies/disjoint.hpp>
 
 
@@ -246,22 +247,11 @@ struct disjoint_segment_box_impl
 // other strategies that are used are intersection and covered_by strategies.
 struct segment_box
 {
-    template <typename Segment, typename Box>
-    struct point_in_geometry_strategy
-        : services::default_strategy
-            <
-                typename point_type<Segment>::type,
-                Box
-            >
-    {};
+    typedef covered_by::cartesian_point_box disjoint_point_box_strategy_type;
 
-    template <typename Segment, typename Box>
-    static inline typename point_in_geometry_strategy<Segment, Box>::type
-        get_point_in_geometry_strategy()
+    static inline disjoint_point_box_strategy_type get_disjoint_point_box_strategy()
     {
-        typedef typename point_in_geometry_strategy<Segment, Box>::type strategy_type;
-
-        return strategy_type();
+        return disjoint_point_box_strategy_type();
     }
 
     template <typename Segment, typename Box>