import quincy beta 17.1.0

[ceph.git] / ceph / src / boost / boost / geometry / algorithms / detail / envelope / point.hpp

diff --git a/ceph/src/boost/boost/geometry/algorithms/detail/envelope/point.hpp b/ceph/src/boost/boost/geometry/algorithms/detail/envelope/point.hpp
index 164274a28035741e407ecfb4fc1fbb8e9231bc65..87f768b508143565eefaf03e02f022b2397210a0 100644 (file)
--- a/ceph/src/boost/boost/geometry/algorithms/detail/envelope/point.hpp
+++ b/ceph/src/boost/boost/geometry/algorithms/detail/envelope/point.hpp
@@ -4,8 +4,8 @@
 // Copyright (c) 2008-2015 Bruno Lalande, Paris, France.
 // Copyright (c) 2009-2015 Mateusz Loskot, London, UK.
 
-// This file was modified by Oracle on 2015, 2016, 2017, 2018.
-// Modifications copyright (c) 2015-2018, Oracle and/or its affiliates.
+// This file was modified by Oracle on 2015-2020.
+// Modifications copyright (c) 2015-2020, 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
@@ -22,11 +22,6 @@
 
 #include <boost/geometry/algorithms/dispatch/envelope.hpp>
 
-// For backward compatibility
-#include <boost/geometry/strategies/cartesian/envelope_point.hpp>
-#include <boost/geometry/strategies/spherical/envelope_point.hpp>
-
-
 namespace boost { namespace geometry
 {
 
@@ -38,9 +33,11 @@ namespace detail { namespace envelope
 struct envelope_point
 {
     template <typename Point, typename Box, typename Strategy>
-    static inline void apply(Point const& point, Box& mbr, Strategy const& )
+    static inline void apply(Point const& point, Box& mbr, Strategy const& strategy)
     {
-        Strategy::apply(point, mbr);
+        // strategy.envelope(point, mbr).apply(point, mbr);
+        using strategy_t = decltype(strategy.envelope(point, mbr));
+        strategy_t::apply(point, mbr);
     }
 };