update ceph source to reef 18.1.2

[ceph.git] / ceph / src / boost / boost / geometry / strategies / spherical / line_interpolate.hpp

diff --git a/ceph/src/boost/boost/geometry/strategies/spherical/line_interpolate.hpp b/ceph/src/boost/boost/geometry/strategies/spherical/line_interpolate.hpp
index 2d602c0e068ab57587af8bcfdcded2ab23987ee0..0d2fcd486c4e66df8b5700a8b54e8806fd7358ca 100644 (file)
--- a/ceph/src/boost/boost/geometry/strategies/spherical/line_interpolate.hpp
+++ b/ceph/src/boost/boost/geometry/strategies/spherical/line_interpolate.hpp
@@ -1,8 +1,9 @@
 // Boost.Geometry
 
-// Copyright (c) 2018, Oracle and/or its affiliates.
+// Copyright (c) 2018-2021, Oracle and/or its affiliates.
 
 // Contributed and/or modified by Vissarion Fysikopoulos, on behalf of Oracle
+// Contributed and/or modified by Adam Wulkiewicz, on behalf of Oracle
 
 // Licensed under the Boost Software License version 1.0.
 // http://www.boost.org/users/license.html
@@ -51,8 +52,7 @@ public:
 
     typedef typename DistanceStrategy::radius_type radius_type;
 
-    inline spherical()
-    {}
+    spherical() = default;
 
     explicit inline spherical(typename DistanceStrategy::radius_type const& r)
         : m_strategy(r)
@@ -62,17 +62,6 @@ public:
         : m_strategy(s)
     {}
 
-    // point-point strategy getters
-    struct distance_pp_strategy
-    {
-        typedef DistanceStrategy type;
-    };
-
-    inline typename distance_pp_strategy::type get_distance_pp_strategy() const
-    {
-        return m_strategy;
-    }
-
     template <typename Point, typename Fraction, typename Distance>
     inline void apply(Point const& p0,
                       Point const& p1,
@@ -95,6 +84,12 @@ public:
         calc_t a = angle01 * fraction;
         formula.compute_point(a, p);
     }
+
+    inline radius_type radius() const
+    {
+        return m_strategy.radius();
+    }
+
 private :
     DistanceStrategy m_strategy;
 };