X-Git-Url: https://git.lyx.org/gitweb/?a=blobdiff_plain;f=3rdparty%2Fboost%2Fboost%2Fregex%2Fv4%2Fperl_matcher_common.hpp;h=3c654e588e708597cecf7d6d3e56203f0001b3c6;hb=09130d7a622;hp=a0973da92a6336a864c9523335d769f1f9eab6db;hpb=294969c6a2ba456c231e52d79b4637cdd50a6a95;p=lyx.git

diff --git a/3rdparty/boost/boost/regex/v4/perl_matcher_common.hpp b/3rdparty/boost/boost/regex/v4/perl_matcher_common.hpp
index a0973da92a..3c654e588e 100644
--- a/3rdparty/boost/boost/regex/v4/perl_matcher_common.hpp
+++ b/3rdparty/boost/boost/regex/v4/perl_matcher_common.hpp
@@ -36,7 +36,9 @@
 #endif
 #ifdef BOOST_MSVC
 #  pragma warning(push)
-#  pragma warning(disable: 4800)
+#if BOOST_MSVC < 1910
+#pragma warning(disable:4800)
+#endif
 #endif
 
 namespace boost{
@@ -476,12 +478,14 @@ bool perl_matcher<BidiIterator, Allocator, traits>::match_word_boundary()
    }
    else
    {
-      b = (m_match_flags & match_not_eow) ? true : false;
+      if (m_match_flags & match_not_eow)
+         return false;
+      b = false;
    }
    if((position == backstop) && ((m_match_flags & match_prev_avail) == 0))
    {
       if(m_match_flags & match_not_bow)
-         b ^= true;
+         return false;
       else
          b ^= false;
    }