import quincy beta 17.1.0

[ceph.git] / ceph / src / boost / boost / geometry / geometries / adapted / boost_tuple.hpp

diff --git a/ceph/src/boost/boost/geometry/geometries/adapted/boost_tuple.hpp b/ceph/src/boost/boost/geometry/geometries/adapted/boost_tuple.hpp
index 88d1af37b898ff0a2b82bc4726f1cc7d779dfb26..84d6eb398d64ea0d7aee8ac1b4e0e45055ab2806 100644 (file)
--- a/ceph/src/boost/boost/geometry/geometries/adapted/boost_tuple.hpp
+++ b/ceph/src/boost/boost/geometry/geometries/adapted/boost_tuple.hpp
@@ -4,8 +4,8 @@
 // Copyright (c) 2008-2012 Barend Gehrels, Amsterdam, the Netherlands.
 // Copyright (c) 2009-2012 Mateusz Loskot, London, UK.
 
-// This file was modified by Oracle on 2018.
-// Modifications copyright (c) 2018, Oracle and/or its affiliates.
+// This file was modified by Oracle on 2018-2020.
+// Modifications copyright (c) 2018-2020, Oracle and/or its affiliates.
 
 // Contributed and/or modified by Adam Wulkiewicz, on behalf of Oracle
 
@@ -21,6 +21,7 @@
 
 
 #include <cstddef>
+#include <type_traits>
 
 #include <boost/tuple/tuple.hpp>
 
@@ -59,13 +60,14 @@ struct coordinate_type<boost::tuple<T1, T2, T3, T4, T5, T6, T7, T8, T9, T10> >
 template <typename T1, typename T2, typename T3, typename T4, typename T5,
           typename T6, typename T7, typename T8, typename T9, typename T10>
 struct dimension<boost::tuple<T1, T2, T3, T4, T5, T6, T7, T8, T9, T10> >
-    : boost::mpl::int_
-          <
-              boost::tuples::length
-                  <
-                      boost::tuple<T1, T2, T3, T4, T5, T6, T7, T8, T9, T10>
-                  >::value
-          >
+    : std::integral_constant
+        <
+            std::size_t,
+            boost::tuples::length
+                <
+                    boost::tuple<T1, T2, T3, T4, T5, T6, T7, T8, T9, T10>
+                >::value
+        >
 {};