diff options
Diffstat (limited to 'boost/regex/v4/perl_matcher_common.hpp')
| -rw-r--r-- | boost/regex/v4/perl_matcher_common.hpp | 10 |
1 files changed, 7 insertions, 3 deletions
diff --git a/boost/regex/v4/perl_matcher_common.hpp b/boost/regex/v4/perl_matcher_common.hpp index a0973da92a..3c654e588e 100644 --- a/boost/regex/v4/perl_matcher_common.hpp +++ b/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; } |