import quincy beta 17.1.0

[ceph.git] / ceph / src / boost / boost / geometry / core / point_type.hpp

diff --git a/ceph/src/boost/boost/geometry/core/point_type.hpp b/ceph/src/boost/boost/geometry/core/point_type.hpp
index f70e1fedd5778dc5a601c7a490ad49c0fd34ed7b..696e1e56add7fee20d5f0f6b38f8329239449aca 100644 (file)
--- a/ceph/src/boost/boost/geometry/core/point_type.hpp
+++ b/ceph/src/boost/boost/geometry/core/point_type.hpp
@@ -4,6 +4,10 @@
 // Copyright (c) 2008-2012 Bruno Lalande, Paris, France.
 // Copyright (c) 2009-2012 Mateusz Loskot, London, UK.
 
+// 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
+
 // Parts of Boost.Geometry are redesigned from Geodan's Geographic Library
 // (geolib/GGL), copyright (c) 1995-2010 Geodan, Amsterdam, the Netherlands.
 
@@ -15,14 +19,14 @@
 #define BOOST_GEOMETRY_CORE_POINT_TYPE_HPP
 
 
-#include <boost/mpl/assert.hpp>
 #include <boost/range/value_type.hpp>
-#include <boost/type_traits/remove_const.hpp>
 
 #include <boost/geometry/core/ring_type.hpp>
+#include <boost/geometry/core/static_assert.hpp>
 #include <boost/geometry/core/tag.hpp>
 #include <boost/geometry/core/tags.hpp>
-#include <boost/geometry/util/bare_type.hpp>
+#include <boost/geometry/util/type_traits_std.hpp>
+
 
 namespace boost { namespace geometry
 {
@@ -42,10 +46,9 @@ namespace traits
 template <typename Geometry>
 struct point_type
 {
-    BOOST_MPL_ASSERT_MSG
-        (
-            false, NOT_IMPLEMENTED_FOR_THIS_POINT_TYPE, (types<Geometry>)
-        );
+    BOOST_GEOMETRY_STATIC_ASSERT_FALSE(
+        "Not implemented for this Geometry type.",
+        Geometry);
 };
 
 
@@ -60,7 +63,7 @@ template <typename Tag, typename Geometry>
 struct point_type
 {
     // Default: call traits to get point type
-    typedef typename boost::remove_const
+    typedef typename std::remove_const
         <
             typename traits::point_type<Geometry>::type
         >::type type;
@@ -151,7 +154,7 @@ struct point_type
     typedef typename core_dispatch::point_type
         <
             typename tag<Geometry>::type,
-            typename boost::geometry::util::bare_type<Geometry>::type
+            typename util::remove_cptrref<Geometry>::type
         >::type type;
 };