import quincy beta 17.1.0

[ceph.git] / ceph / src / boost / boost / geometry / strategies / concepts / distance_concept.hpp

diff --git a/ceph/src/boost/boost/geometry/strategies/concepts/distance_concept.hpp b/ceph/src/boost/boost/geometry/strategies/concepts/distance_concept.hpp
index ea811d921bb8092ebde28a8b4789210846b6bce6..c14e4e3bc2de997459ea3817bf8c1131565a409a 100644 (file)
--- a/ceph/src/boost/boost/geometry/strategies/concepts/distance_concept.hpp
+++ b/ceph/src/boost/boost/geometry/strategies/concepts/distance_concept.hpp
@@ -4,8 +4,8 @@
 // Copyright (c) 2008-2014 Bruno Lalande, Paris, France.
 // Copyright (c) 2009-2014 Mateusz Loskot, London, UK.
 
-// This file was modified by Oracle on 2014, 2018.
-// Modifications copyright (c) 2014, 2018, Oracle and/or its affiliates.
+// This file was modified by Oracle on 2014-2020.
+// Modifications copyright (c) 2014-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
@@ -20,15 +20,14 @@
 #ifndef BOOST_GEOMETRY_STRATEGIES_CONCEPTS_DISTANCE_CONCEPT_HPP
 #define BOOST_GEOMETRY_STRATEGIES_CONCEPTS_DISTANCE_CONCEPT_HPP
 
-#include <vector>
 #include <iterator>
+#include <type_traits>
+#include <vector>
 
 #include <boost/concept_check.hpp>
 #include <boost/core/ignore_unused.hpp>
-#include <boost/mpl/assert.hpp>
-#include <boost/type_traits/is_same.hpp>
 
-#include <boost/geometry/util/parameter_type_of.hpp>
+#include <boost/geometry/core/static_assert.hpp>
 
 #include <boost/geometry/geometries/concepts/point_concept.hpp>
 #include <boost/geometry/geometries/segment.hpp>
@@ -37,6 +36,8 @@
 #include <boost/geometry/strategies/distance.hpp>
 #include <boost/geometry/strategies/tags.hpp>
 
+#include <boost/geometry/util/parameter_type_of.hpp>
+
 
 namespace boost { namespace geometry { namespace concepts
 {
@@ -87,14 +88,14 @@ private :
                 >::type tag;
 
             static const bool is_correct_strategy_tag =
-                boost::is_same<tag, strategy_tag_distance_point_point>::value
-                || boost::is_same<tag, strategy_tag_distance_point_box>::value
-                || boost::is_same<tag, strategy_tag_distance_box_box>::value;
+                std::is_same<tag, strategy_tag_distance_point_point>::value
+                || std::is_same<tag, strategy_tag_distance_point_box>::value
+                || std::is_same<tag, strategy_tag_distance_box_box>::value;
 
-            BOOST_MPL_ASSERT_MSG
-                ((is_correct_strategy_tag),
-                 INCORRECT_STRATEGY_TAG,
-                 (types<tag>));
+            BOOST_GEOMETRY_STATIC_ASSERT(
+                 is_correct_strategy_tag,
+                 "Incorrect Strategy tag.",
+                 Strategy, tag);
 
             // 5) must implement apply with arguments
             Strategy* str = 0;
@@ -161,13 +162,13 @@ private :
             // 2) must define meta-function "tag"
             typedef typename services::tag<Strategy>::type tag;
 
-            BOOST_MPL_ASSERT_MSG
-                ((boost::is_same
-                      <
-                          tag, strategy_tag_distance_point_segment
-                      >::value),
-                 INCORRECT_STRATEGY_TAG,
-                 (types<tag>));
+            BOOST_GEOMETRY_STATIC_ASSERT(
+                (std::is_same
+                    <
+                        tag, strategy_tag_distance_point_segment
+                    >::value),
+                "Incorrect Strategy tag.",
+                Strategy, tag);
 
             // 3) must define meta-function "return_type"
             typedef typename services::return_type