import quincy beta 17.1.0

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

diff --git a/ceph/src/boost/boost/geometry/algorithms/detail/expand/point.hpp b/ceph/src/boost/boost/geometry/algorithms/detail/expand/point.hpp
index d4a9097cb3eafa56dcb27774281965099855fcd8..17ab1fbcf7e312597b781eabe1634e50a8e974e0 100644 (file)
--- a/ceph/src/boost/boost/geometry/algorithms/detail/expand/point.hpp
+++ b/ceph/src/boost/boost/geometry/algorithms/detail/expand/point.hpp
@@ -5,8 +5,8 @@
 // Copyright (c) 2009-2015 Mateusz Loskot, London, UK.
 // Copyright (c) 2014-2015 Samuel Debionne, Grenoble, France.
 
-// This file was modified by Oracle on 2015-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
@@ -27,10 +27,6 @@
 
 #include <boost/geometry/core/tags.hpp>
 
-// For backward compatibility
-#include <boost/geometry/strategies/cartesian/expand_point.hpp>
-#include <boost/geometry/strategies/spherical/expand_point.hpp>
-
 
 namespace boost { namespace geometry
 {
@@ -54,9 +50,11 @@ struct expand
     template <typename Strategy>
     static inline void apply(BoxOut& box,
                              Point const& point,
-                             Strategy const& )
+                             Strategy const& strategy)
     {
-        Strategy::apply(box, point);
+        // strategy.expand(box, point).apply(box, point);
+        using strategy_t = decltype(strategy.expand(box, point));
+        strategy_t::apply(box, point);
     }
 };