update sources to ceph Nautilus 14.2.1

[ceph.git] / ceph / src / boost / boost / geometry / formulas / vertex_longitude.hpp

diff --git a/ceph/src/boost/boost/geometry/formulas/vertex_longitude.hpp b/ceph/src/boost/boost/geometry/formulas/vertex_longitude.hpp
index 00f2fd4e7aebc147ea5f55ff21a7b0eba89f17fb..cf63c10a0a1c9ece86e746cc17ddeea975d455fe 100644 (file)
--- a/ceph/src/boost/boost/geometry/formulas/vertex_longitude.hpp
+++ b/ceph/src/boost/boost/geometry/formulas/vertex_longitude.hpp
@@ -14,7 +14,7 @@
 
 #include <boost/geometry/formulas/spherical.hpp>
 #include <boost/geometry/formulas/flattening.hpp>
-#include <boost/geometry/core/srs.hpp>
+
 #include <boost/mpl/assert.hpp>
 
 #include <boost/math/special_functions/hypot.hpp>
@@ -209,12 +209,10 @@ public:
                             + C31 * (sin2_sig3 - sin2_sig1)
                             + C32 * (sin4_sig3 - sin4_sig1));
 
-        int sign = c1;
-        if (bet3 < c0)
-        {
-            sign = cminus1;
-        }
-
+        CT const sign = bet3 >= c0
+                      ? c1
+                      : cminus1;
+        
         CT const dlon_max = omg13 - sign * f * sin_alp0 * I3;
 
         return dlon_max;