update ceph source to reef 18.1.2

[ceph.git] / ceph / src / boost / boost / geometry / strategies / geographic / azimuth.hpp

diff --git a/ceph/src/boost/boost/geometry/strategies/geographic/azimuth.hpp b/ceph/src/boost/boost/geometry/strategies/geographic/azimuth.hpp
index ca280313d232b32386c09781b789fc4fd4e111ae..9e6914d92d9c7e4e49e9865547735f4cf740a40b 100644 (file)
--- a/ceph/src/boost/boost/geometry/strategies/geographic/azimuth.hpp
+++ b/ceph/src/boost/boost/geometry/strategies/geographic/azimuth.hpp
@@ -1,6 +1,6 @@
 // Boost.Geometry (aka GGL, Generic Geometry Library)
 
-// Copyright (c) 2016-2020 Oracle and/or its affiliates.
+// Copyright (c) 2016-2021 Oracle and/or its affiliates.
 // Contributed and/or modified by Vissarion Fisikopoulos, on behalf of Oracle
 // Contributed and/or modified by Adam Wulkiewicz, on behalf of Oracle
 
@@ -19,6 +19,8 @@
 #include <boost/geometry/strategies/azimuth.hpp>
 #include <boost/geometry/strategies/geographic/parameters.hpp>
 
+#include <boost/geometry/util/select_most_precise.hpp>
+
 
 namespace boost { namespace geometry
 {
@@ -34,7 +36,14 @@ template
 >
 class geographic
 {
-public :
+public:
+    template <typename T1, typename T2>
+    struct result_type
+        : geometry::select_most_precise
+              <
+                  T1, T2, CalculationType
+              >
+    {};
 
     typedef Spheroid model_type;
 
@@ -51,28 +60,28 @@ public :
         return m_spheroid;
     }
 
-    template <typename T>
-    inline void apply(T const& lon1_rad, T const& lat1_rad,
-                      T const& lon2_rad, T const& lat2_rad,
-                      T& a1, T& a2) const
+    template <typename T1, typename T2, typename Result>
+    inline void apply(T1 const& lon1_rad, T1 const& lat1_rad,
+                      T2 const& lon2_rad, T2 const& lat2_rad,
+                      Result& a1, Result& a2) const
     {
         compute<true, true>(lon1_rad, lat1_rad,
                             lon2_rad, lat2_rad,
                             a1, a2);
     }
-    template <typename T>
-    inline void apply(T const& lon1_rad, T const& lat1_rad,
-                      T const& lon2_rad, T const& lat2_rad,
-                      T& a1) const
+    template <typename T1, typename T2, typename Result>
+    inline void apply(T1 const& lon1_rad, T1 const& lat1_rad,
+                      T2 const& lon2_rad, T2 const& lat2_rad,
+                      Result& a1) const
     {
         compute<true, false>(lon1_rad, lat1_rad,
                              lon2_rad, lat2_rad,
                              a1, a1);
     }
-    template <typename T>
-    inline void apply_reverse(T const& lon1_rad, T const& lat1_rad,
-                              T const& lon2_rad, T const& lat2_rad,
-                              T& a2) const
+    template <typename T1, typename T2, typename Result>
+    inline void apply_reverse(T1 const& lon1_rad, T1 const& lat1_rad,
+                              T2 const& lon2_rad, T2 const& lat2_rad,
+                              Result& a2) const
     {
         compute<false, true>(lon1_rad, lat1_rad,
                              lon2_rad, lat2_rad,
@@ -85,16 +94,13 @@ private :
     <
         bool EnableAzimuth,
         bool EnableReverseAzimuth,
-        typename T
+        typename T1, typename T2, typename Result
     >
-    inline void compute(T const& lon1_rad, T const& lat1_rad,
-                        T const& lon2_rad, T const& lat2_rad,
-                        T& a1, T& a2) const
+    inline void compute(T1 const& lon1_rad, T1 const& lat1_rad,
+                        T2 const& lon2_rad, T2 const& lat2_rad,
+                        Result& a1, Result& a2) const
     {
-        typedef std::conditional_t
-            <
-                std::is_void<CalculationType>::value, T, CalculationType
-            > calc_t;
+        typedef typename result_type<T1, T2>::type calc_t;
 
         typedef typename FormulaPolicy::template inverse
             <
@@ -127,14 +133,13 @@ private :
 namespace services
 {
 
-template <typename CalculationType>
-struct default_strategy<geographic_tag, CalculationType>
+template <>
+struct default_strategy<geographic_tag>
 {
     typedef strategy::azimuth::geographic
         <
             strategy::andoyer,
-            srs::spheroid<double>,
-            CalculationType
+            srs::spheroid<double>
         > type;
 };