import new upstream nautilus stable release 14.2.8

[ceph.git] / ceph / src / boost / boost / lexical_cast / detail / lcast_unsigned_converters.hpp

diff --git a/ceph/src/boost/boost/lexical_cast/detail/lcast_unsigned_converters.hpp b/ceph/src/boost/boost/lexical_cast/detail/lcast_unsigned_converters.hpp
index 268961ee72f16d2ba4f75ea6b00dcb49b3f3466e..c837832f34fc26e10e484acca24236697dc598cb 100644 (file)
--- a/ceph/src/boost/boost/lexical_cast/detail/lcast_unsigned_converters.hpp
+++ b/ceph/src/boost/boost/lexical_cast/detail/lcast_unsigned_converters.hpp
@@ -1,6 +1,6 @@
 // Copyright Kevlin Henney, 2000-2005.
 // Copyright Alexander Nasonov, 2006-2010.
-// Copyright Antony Polukhin, 2011-2014.
+// Copyright Antony Polukhin, 2011-2019.
 //
 // Distributed under the Boost Software License, Version 1.0. (See
 // accompanying file LICENSE_1_0.txt or copy at
@@ -29,7 +29,7 @@
 #include <cstring>
 #include <cstdio>
 #include <boost/limits.hpp>
-#include <boost/mpl/if.hpp>
+#include <boost/type_traits/conditional.hpp>
 #include <boost/static_assert.hpp>
 #include <boost/detail/workaround.hpp>
 
@@ -71,9 +71,9 @@ namespace boost
         template <class Traits, class T, class CharT>
         class lcast_put_unsigned: boost::noncopyable {
             typedef BOOST_DEDUCED_TYPENAME Traits::int_type int_type;
-            BOOST_DEDUCED_TYPENAME boost::mpl::if_c<
-                    (sizeof(int_type) > sizeof(T))
-                    , int_type
+            BOOST_DEDUCED_TYPENAME boost::conditional<
+                    (sizeof(unsigned) > sizeof(T))
+                    , unsigned
                     , T
             >::type         m_value;
             CharT*          m_finish;