X-Git-Url: https://git.lyx.org/gitweb/?a=blobdiff_plain;ds=inline;f=3rdparty%2Fboost%2Fboost%2Fregex%2Fv4%2Fbasic_regex_parser.hpp;h=6c7065f057bbfc226cda5ffa442f624705f3ba47;hb=09130d7a622;hp=7c2852fa510693b404003896cae2a7b4aff66d13;hpb=294969c6a2ba456c231e52d79b4637cdd50a6a95;p=lyx.git diff --git a/3rdparty/boost/boost/regex/v4/basic_regex_parser.hpp b/3rdparty/boost/boost/regex/v4/basic_regex_parser.hpp index 7c2852fa51..6c7065f057 100644 --- a/3rdparty/boost/boost/regex/v4/basic_regex_parser.hpp +++ b/3rdparty/boost/boost/regex/v4/basic_regex_parser.hpp @@ -35,7 +35,10 @@ namespace BOOST_REGEX_DETAIL_NS{ #ifdef BOOST_MSVC #pragma warning(push) -#pragma warning(disable:4244 4800) +#pragma warning(disable:4244) +#if BOOST_MSVC < 1910 +#pragma warning(disable:4800) +#endif #endif inline boost::intmax_t umax(mpl::false_ const&) @@ -183,7 +186,7 @@ void basic_regex_parser::parse(const charT* p1, const charT* p2, // have had an unexpected ')' : if(!result) { - fail(regex_constants::error_paren, ::boost::BOOST_REGEX_DETAIL_NS::distance(m_base, m_position), "Found a closing ) with no corresponding openening parenthesis."); + fail(regex_constants::error_paren, ::boost::BOOST_REGEX_DETAIL_NS::distance(m_base, m_position), "Found a closing ) with no corresponding opening parenthesis."); return; } // if an error has been set then give up now: