import quincy beta 17.1.0

[ceph.git] / ceph / src / boost / boost / geometry / index / detail / algorithms / margin.hpp

diff --git a/ceph/src/boost/boost/geometry/index/detail/algorithms/margin.hpp b/ceph/src/boost/boost/geometry/index/detail/algorithms/margin.hpp
index d4876600acb6865259ebf3531f17194251716b91..2033f4a531e8ecc448d2c762435713d5b3b058a0 100644 (file)
--- a/ceph/src/boost/boost/geometry/index/detail/algorithms/margin.hpp
+++ b/ceph/src/boost/boost/geometry/index/detail/algorithms/margin.hpp
@@ -4,6 +4,10 @@
 //
 // Copyright (c) 2011-2014 Adam Wulkiewicz, Lodz, Poland.
 //
+// This file was modified by Oracle on 2020.
+// Modifications copyright (c) 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,
 // Version 1.0. (See accompanying file LICENSE_1_0.txt or copy at
 // http://www.boost.org/LICENSE_1_0.txt)
@@ -11,6 +15,8 @@
 #ifndef BOOST_GEOMETRY_INDEX_DETAIL_ALGORITHMS_MARGIN_HPP
 #define BOOST_GEOMETRY_INDEX_DETAIL_ALGORITHMS_MARGIN_HPP
 
+#include <boost/geometry/core/static_assert.hpp>
+
 // WARNING! comparable_margin() will work only if the same Geometries are compared
 // so it shouldn't be used in the case of Variants!
 
@@ -124,7 +130,9 @@ namespace dispatch {
 template <typename Geometry, typename Tag>
 struct comparable_margin
 {
-    BOOST_MPL_ASSERT_MSG(false, NOT_IMPLEMENTED_FOR_THIS_GEOMETRY, (Geometry, Tag));
+    BOOST_GEOMETRY_STATIC_ASSERT_FALSE(
+        "Not implemented for this Geometry type.",
+        Geometry, Tag);
 };
 
 template <typename Geometry>