import quincy beta 17.1.0

[ceph.git] / ceph / src / boost / boost / geometry / index / parameters.hpp

diff --git a/ceph/src/boost/boost/geometry/index/parameters.hpp b/ceph/src/boost/boost/geometry/index/parameters.hpp
index 7c5b3fb4fce6fef6c87e15ee61ae37d82d6dcde5..fdaef9284b54a5d0fbba9079b3f2ab3b9abdd4eb 100644 (file)
--- a/ceph/src/boost/boost/geometry/index/parameters.hpp
+++ b/ceph/src/boost/boost/geometry/index/parameters.hpp
@@ -4,8 +4,8 @@
 //
 // Copyright (c) 2011-2017 Adam Wulkiewicz, Lodz, Poland.
 //
-// This file was modified by Oracle on 2019.
-// Modifications copyright (c) 2019 Oracle and/or its affiliates.
+// This file was modified by Oracle on 2019-2020.
+// Modifications copyright (c) 2019-2020 Oracle and/or its affiliates.
 // Contributed and/or modified by Adam Wulkiewicz, on behalf of Oracle
 //
 // Use, modification and distribution is subject to the Boost Software License,
@@ -18,7 +18,7 @@
 
 #include <limits>
 
-#include <boost/mpl/assert.hpp>
+#include <boost/geometry/core/static_assert.hpp>
 
 #include <boost/geometry/index/detail/exception.hpp>
 
@@ -83,8 +83,9 @@ template <size_t MaxElements,
           size_t MinElements = detail::default_min_elements_s<MaxElements>::value>
 struct linear
 {
-    BOOST_MPL_ASSERT_MSG((0 < MinElements && 2*MinElements <= MaxElements+1),
-                         INVALID_STATIC_MIN_MAX_PARAMETERS, (linear));
+    BOOST_GEOMETRY_STATIC_ASSERT((0 < MinElements && 2*MinElements <= MaxElements+1),
+        "Invalid MaxElements or MinElements.",
+        std::integer_sequence<size_t, MaxElements, MinElements>);
 
     static const size_t max_elements = MaxElements;
     static const size_t min_elements = MinElements;
@@ -103,8 +104,9 @@ template <size_t MaxElements,
           size_t MinElements = detail::default_min_elements_s<MaxElements>::value>
 struct quadratic
 {
-    BOOST_MPL_ASSERT_MSG((0 < MinElements && 2*MinElements <= MaxElements+1),
-                         INVALID_STATIC_MIN_MAX_PARAMETERS, (quadratic));
+    BOOST_GEOMETRY_STATIC_ASSERT((0 < MinElements && 2*MinElements <= MaxElements+1),
+        "Invalid MaxElements or MinElements.",
+        std::integer_sequence<size_t, MaxElements, MinElements>);
 
     static const size_t max_elements = MaxElements;
     static const size_t min_elements = MinElements;
@@ -133,8 +135,9 @@ template <size_t MaxElements,
           size_t OverlapCostThreshold = 32>
 struct rstar
 {
-    BOOST_MPL_ASSERT_MSG((0 < MinElements && 2*MinElements <= MaxElements+1),
-                         INVALID_STATIC_MIN_MAX_PARAMETERS, (rstar));
+    BOOST_GEOMETRY_STATIC_ASSERT((0 < MinElements && 2*MinElements <= MaxElements+1),
+        "Invalid MaxElements or MinElements.",
+        std::integer_sequence<size_t, MaxElements, MinElements>);
 
     static const size_t max_elements = MaxElements;
     static const size_t min_elements = MinElements;