import new upstream nautilus stable release 14.2.8

[ceph.git] / ceph / src / boost / boost / core / no_exceptions_support.hpp

diff --git a/ceph/src/boost/boost/core/no_exceptions_support.hpp b/ceph/src/boost/boost/core/no_exceptions_support.hpp
index e2453d084ba5e1e8f2786e9a65c5fee28ac7664f..6fd76b241a631d35d43df4488b15b858036d31bb 100644 (file)
--- a/ceph/src/boost/boost/core/no_exceptions_support.hpp
+++ b/ceph/src/boost/boost/core/no_exceptions_support.hpp
@@ -32,9 +32,21 @@
 #    if BOOST_WORKAROUND(__BORLANDC__, BOOST_TESTED_AT(0x564))
 #        define BOOST_TRY { if ("")
 #        define BOOST_CATCH(x) else if (!"")
-#    else
+#    elif !defined(BOOST_MSVC) || BOOST_MSVC >= 1900
 #        define BOOST_TRY { if (true)
 #        define BOOST_CATCH(x) else if (false)
+#    else
+         // warning C4127: conditional expression is constant
+#        define BOOST_TRY { \
+             __pragma(warning(push)) \
+             __pragma(warning(disable: 4127)) \
+             if (true) \
+             __pragma(warning(pop))
+#        define BOOST_CATCH(x) else \
+             __pragma(warning(push)) \
+             __pragma(warning(disable: 4127)) \
+             if (false) \
+             __pragma(warning(pop))
 #    endif
 #    define BOOST_RETHROW
 #    define BOOST_CATCH_END }