update sources to ceph Nautilus 14.2.1

[ceph.git] / ceph / src / boost / boost / units / detail / linear_algebra.hpp

diff --git a/ceph/src/boost/boost/units/detail/linear_algebra.hpp b/ceph/src/boost/boost/units/detail/linear_algebra.hpp
index 96b27a2532223f5b55defff263dfa31a718cf644..17ed34bd1b7ea62df6672c1f569ad23c6b6c03d2 100644 (file)
--- a/ceph/src/boost/boost/units/detail/linear_algebra.hpp
+++ b/ceph/src/boost/boost/units/detail/linear_algebra.hpp
@@ -598,8 +598,8 @@ struct set_insert<false> {
 
 template<class Set, class T>
 struct has_key {
-    static const long size = sizeof(Set::lookup((wrap<T>*)0));
-    static const bool value = (size == sizeof(set_yes));
+    BOOST_STATIC_CONSTEXPR long size = sizeof(Set::lookup((wrap<T>*)0));
+    BOOST_STATIC_CONSTEXPR bool value = (size == sizeof(set_yes));
 };
 
 template<int N>
@@ -826,7 +826,7 @@ struct normalize_units {
         dimensions
     >::type matrix;
     typedef typename make_square_and_invert<matrix>::type type;
-    static const long extra = (type::size::value) - (T::size::value);
+    BOOST_STATIC_CONSTEXPR long extra = (type::size::value) - (T::size::value);
 };
 
 // multiply_add_units computes M x V
@@ -977,7 +977,7 @@ struct is_simple_system_impl {
                 typename test::base_dimension_type
             >
         > type;
-        static const bool value = (type::value);
+        BOOST_STATIC_CONSTEXPR bool value = (type::value);
     };
 };
 
@@ -1001,7 +1001,7 @@ struct is_simple_system {
             typename test::base_dimension_type
         >
     >::type type;
-    static const bool value = type::value;
+    BOOST_STATIC_CONSTEXPR bool value = type::value;
 };
 
 template<bool>