import new upstream nautilus stable release 14.2.8

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

diff --git a/ceph/src/boost/boost/lexical_cast/detail/widest_char.hpp b/ceph/src/boost/boost/lexical_cast/detail/widest_char.hpp
index 013aaf119de420d6d96ae87b5eb2ea6a1c97fc1c..b9c725b61fbb0c04ec7ef136005575affff02600 100644 (file)
--- a/ceph/src/boost/boost/lexical_cast/detail/widest_char.hpp
+++ b/ceph/src/boost/boost/lexical_cast/detail/widest_char.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
@@ -23,11 +23,14 @@
 #   pragma once
 #endif
 
+
+#include <boost/type_traits/conditional.hpp>
+
 namespace boost { namespace detail {
 
     template <typename TargetChar, typename SourceChar>
     struct widest_char {
-        typedef BOOST_DEDUCED_TYPENAME boost::mpl::if_c<
+        typedef BOOST_DEDUCED_TYPENAME boost::conditional<
             (sizeof(TargetChar) > sizeof(SourceChar))
             , TargetChar
             , SourceChar