Update to boost 1.72

[lyx.git] / 3rdparty / boost / boost / regex / v4 / basic_regex.hpp

diff --git a/3rdparty/boost/boost/regex/v4/basic_regex.hpp b/3rdparty/boost/boost/regex/v4/basic_regex.hpp
index ac91af2914c7488ba2d9ee9d8381e1ced0fbed33..b3bb1fe0d42dc64b27d9198873af02a8763ef6cf 100644 (file)
--- a/3rdparty/boost/boost/regex/v4/basic_regex.hpp
+++ b/3rdparty/boost/boost/regex/v4/basic_regex.hpp
@@ -20,7 +20,7 @@
 #define BOOST_REGEX_V4_BASIC_REGEX_HPP
 
 #include <boost/type_traits/is_same.hpp>
-#include <boost/functional/hash.hpp>
+#include <boost/container_hash/hash.hpp>
 
 #ifdef BOOST_MSVC
 #pragma warning(push)
@@ -36,10 +36,16 @@
 namespace boost{
 #ifdef BOOST_MSVC
 #pragma warning(push)
-#pragma warning(disable : 4251 4231 4800)
+#pragma warning(disable : 4251)
+#if BOOST_MSVC < 1700
+#     pragma warning(disable : 4231)
+#endif
 #if BOOST_MSVC < 1600
 #pragma warning(disable : 4660)
 #endif
+#if BOOST_MSVC < 1910
+#pragma warning(disable:4800)
+#endif
 #endif
 
 namespace BOOST_REGEX_DETAIL_NS{