import quincy beta 17.1.0

[ceph.git] / ceph / src / boost / boost / geometry / strategies / normalize.hpp

diff --git a/ceph/src/boost/boost/geometry/strategies/normalize.hpp b/ceph/src/boost/boost/geometry/strategies/normalize.hpp
index 1887c1e63bbb078a61276a15fd7c2ee8a1d982ba..a722b1fe0a1a7c39a0001b6f3cc6198ba9ebb7a8 100644 (file)
--- a/ceph/src/boost/boost/geometry/strategies/normalize.hpp
+++ b/ceph/src/boost/boost/geometry/strategies/normalize.hpp
@@ -1,6 +1,6 @@
 // Boost.Geometry (aka GGL, Generic Geometry Library)
 
-// Copyright (c) 2015-2018, Oracle and/or its affiliates.
+// Copyright (c) 2015-2020, Oracle and/or its affiliates.
 
 // Contributed and/or modified by Menelaos Karavelas, on behalf of Oracle
 // Contributed and/or modified by Adam Wulkiewicz, on behalf of Oracle
@@ -12,6 +12,7 @@
 #define BOOST_GEOMETRY_STRATEGIES_NORMALIZE_HPP
 
 #include <cstddef>
+#include <type_traits>
 
 #include <boost/numeric/conversion/cast.hpp>
 
@@ -229,14 +230,11 @@ struct spherical_point
         detail::normalize_point
             <
                 PointIn, PointOut,
-                boost::mpl::not_
+                (! std::is_same
                     <
-                        boost::is_same
-                            <
-                                typename cs_tag<PointIn>::type,
-                                spherical_polar_tag
-                            >
-                    >::value
+                        typename cs_tag<PointIn>::type,
+                        spherical_polar_tag
+                    >::value)
             >::apply(point_in, point_out);
     }
 };
@@ -249,14 +247,11 @@ struct spherical_box
         detail::normalize_box
             <
                 BoxIn, BoxOut,
-                boost::mpl::not_
+                (! std::is_same
                     <
-                        boost::is_same
-                            <
-                                typename cs_tag<BoxIn>::type,
-                                spherical_polar_tag
-                            >
-                    >::value
+                        typename cs_tag<BoxIn>::type,
+                        spherical_polar_tag
+                    >::value)
             >::apply(box_in, box_out);
     }
 };