import new upstream nautilus stable release 14.2.8

[ceph.git] / ceph / src / boost / boost / regex / v4 / perl_matcher.hpp

diff --git a/ceph/src/boost/boost/regex/v4/perl_matcher.hpp b/ceph/src/boost/boost/regex/v4/perl_matcher.hpp
index a696e5d99b57a2baebd25ff4347a9b0cd34d2034..663e6188e23635b39942f7798c4e67ed9b2f8b8d 100644 (file)
--- a/ceph/src/boost/boost/regex/v4/perl_matcher.hpp
+++ b/ceph/src/boost/boost/regex/v4/perl_matcher.hpp
@@ -27,7 +27,9 @@
 
 #ifdef BOOST_MSVC
 #  pragma warning(push)
-#  pragma warning(disable: 4800)
+#if BOOST_MSVC < 1910
+#pragma warning(disable:4800)
+#endif
 #endif
 
 namespace boost{
@@ -353,7 +355,10 @@ struct recursion_info
 
 #ifdef BOOST_MSVC
 #pragma warning(push)
-#pragma warning(disable : 4251 4231)
+#pragma warning(disable : 4251)
+#if BOOST_MSVC < 1700
+#     pragma warning(disable : 4231)
+#endif
 #  if BOOST_MSVC < 1600
 #     pragma warning(disable : 4660)
 #  endif