update sources to ceph Nautilus 14.2.1

[ceph.git] / ceph / src / boost / libs / pool / test / test_simple_seg_storage.cpp

diff --git a/ceph/src/boost/libs/pool/test/test_simple_seg_storage.cpp b/ceph/src/boost/libs/pool/test/test_simple_seg_storage.cpp
index 1fbb06c2a050b068ce962e7a4fa5468b438c534e..ee5ddeac78474693a38b29fb22f941d8d6e62f7c 100644 (file)
--- a/ceph/src/boost/libs/pool/test/test_simple_seg_storage.cpp
+++ b/ceph/src/boost/libs/pool/test/test_simple_seg_storage.cpp
@@ -12,14 +12,17 @@
 #include <boost/pool/simple_segregated_storage.hpp>
 #include <boost/assert.hpp>
 #include <boost/integer/common_factor_ct.hpp>
-#if defined(BOOST_MSVC) && (BOOST_MSVC == 1400)
+#if defined(BOOST_MSVC) && (BOOST_MSVC <= 1600)
 #pragma warning(push)
-#pragma warning(disable:4244)
+#pragma warning(disable: 4244)
+// ..\..\boost/random/uniform_int_distribution.hpp(171) :
+//   warning C4127: conditional expression is constant
+#pragma warning(disable: 4127)
 #endif
 #include <boost/random/mersenne_twister.hpp>
 #include <boost/random/uniform_int.hpp>
 #include <boost/random/variate_generator.hpp>
-#if defined(BOOST_MSVC) && (BOOST_MSVC == 1400)
+#if defined(BOOST_MSVC) && (BOOST_MSVC <= 1600)
 #pragma warning(pop)
 #endif