import quincy beta 17.1.0

[ceph.git] / ceph / src / boost / boost / geometry / iterators / point_iterator.hpp

diff --git a/ceph/src/boost/boost/geometry/iterators/point_iterator.hpp b/ceph/src/boost/boost/geometry/iterators/point_iterator.hpp
index 5ee0e54917bf7036af2995001b42378fdb751098..12e1d85c21f1f7a6eb574d1c4e90118a3a18d355 100644 (file)
--- a/ceph/src/boost/boost/geometry/iterators/point_iterator.hpp
+++ b/ceph/src/boost/boost/geometry/iterators/point_iterator.hpp
@@ -1,8 +1,8 @@
 // Boost.Geometry (aka GGL, Generic Geometry Library)
 
-// Copyright (c) 2014, Oracle and/or its affiliates.
-
+// 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
 
 // Licensed under the Boost Software License version 1.0.
 // http://www.boost.org/users/license.html
@@ -10,13 +10,16 @@
 #ifndef BOOST_GEOMETRY_ITERATORS_POINT_ITERATOR_HPP
 #define BOOST_GEOMETRY_ITERATORS_POINT_ITERATOR_HPP
 
+
+#include <type_traits>
+
 #include <boost/iterator/iterator_adaptor.hpp>
-#include <boost/mpl/assert.hpp>
-#include <boost/type_traits/is_convertible.hpp>
-#include <boost/range.hpp>
+#include <boost/range/begin.hpp>
+#include <boost/range/end.hpp>
 
 #include <boost/geometry/core/exterior_ring.hpp>
 #include <boost/geometry/core/interior_rings.hpp>
+#include <boost/geometry/core/static_assert.hpp>
 #include <boost/geometry/core/tags.hpp>
 
 #include <boost/geometry/iterators/dispatch/point_iterator.hpp>
@@ -267,7 +270,7 @@ public:
         : point_iterator::iterator_adaptor_(other.base())
     {
         static const bool is_conv
-            = boost::is_convertible<
+            = std::is_convertible<
                 typename detail::point_iterator::iterator_type
                     <
                         OtherGeometry
@@ -278,9 +281,9 @@ public:
                     >::type
             >::value;
 
-        BOOST_MPL_ASSERT_MSG((is_conv),
-                             NOT_CONVERTIBLE,
-                             (point_iterator<OtherGeometry>));
+        BOOST_GEOMETRY_STATIC_ASSERT((is_conv),
+            "Other iterator has to be convertible to member iterator.",
+            point_iterator<OtherGeometry>);
     }
 };