Update to boost 1.72

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

diff --git a/3rdparty/boost/boost/regex/v4/w32_regex_traits.hpp b/3rdparty/boost/boost/regex/v4/w32_regex_traits.hpp
index 560cc217bb3ff49fbe8abd8df894af5175e69559..378ee8565e1e36c537c4cd31f318cb35cf7d9c09 100644 (file)
--- a/3rdparty/boost/boost/regex/v4/w32_regex_traits.hpp
+++ b/3rdparty/boost/boost/regex/v4/w32_regex_traits.hpp
@@ -51,8 +51,10 @@
 #ifdef BOOST_MSVC
 #pragma warning(push)
 #pragma warning(disable:4786)
+#if BOOST_MSVC < 1910
 #pragma warning(disable:4800)
 #endif
+#endif
 
 namespace boost{ 
 
@@ -640,13 +642,13 @@ public:
          return true;
       return false;
    }
-   int toi(const charT*& p1, const charT* p2, int radix)const
+   boost::intmax_t toi(const charT*& p1, const charT* p2, int radix)const
    {
       return ::boost::BOOST_REGEX_DETAIL_NS::global_toi(p1, p2, radix, *this);
    }
    int value(charT c, int radix)const
    {
-      int result = ::boost::BOOST_REGEX_DETAIL_NS::global_value(c);
+      int result = (int)::boost::BOOST_REGEX_DETAIL_NS::global_value(c);
       return result < radix ? result : -1;
    }
    locale_type imbue(locale_type l)