From 9424952e8f12a743ba90d682a8981014538f610d Mon Sep 17 00:00:00 2001 From: John Maddock Date: Sat, 5 Jun 2004 11:46:45 +0000 Subject: [PATCH] Added workarounds for Sunpro and HP aCC [SVN r23032] --- include/boost/regex/v4/match_flags.hpp | 6 +++--- include/boost/regex/v4/regex_token_iterator.hpp | 6 ++++-- 2 files changed, 7 insertions(+), 5 deletions(-) diff --git a/include/boost/regex/v4/match_flags.hpp b/include/boost/regex/v4/match_flags.hpp index 7700c62e..0ac8f8cf 100644 --- a/include/boost/regex/v4/match_flags.hpp +++ b/include/boost/regex/v4/match_flags.hpp @@ -88,11 +88,11 @@ inline match_flags operator^(match_flags m1, match_flags m2) inline match_flags operator~(match_flags m1) { return static_cast(~static_cast(m1)); } inline match_flags& operator&=(match_flags& m1, match_flags m2) -{ m1 = m1&m2; return m1; } +{ m1 = static_cast(m1&m2); return m1; } inline match_flags& operator|=(match_flags& m1, match_flags m2) -{ m1 = m1|m2; return m1; } +{ m1 = static_cast(m1|m2); return m1; } inline match_flags& operator^=(match_flags& m1, match_flags m2) -{ m1 = m1^m2; return m1; } +{ m1 = static_cast(m1^m2); return m1; } #endif #endif diff --git a/include/boost/regex/v4/regex_token_iterator.hpp b/include/boost/regex/v4/regex_token_iterator.hpp index 70c48fab..f6f944ab 100644 --- a/include/boost/regex/v4/regex_token_iterator.hpp +++ b/include/boost/regex/v4/regex_token_iterator.hpp @@ -68,7 +68,8 @@ public: : end(last), pre(p), flags(f), subs(v){} #if (BOOST_WORKAROUND(__BORLANDC__, >= 0x560) && BOOST_WORKAROUND(__BORLANDC__, BOOST_TESTED_AT(0x570)))\ || BOOST_WORKAROUND(BOOST_MSVC, < 1300) \ - || BOOST_WORKAROUND(__MWERKS__, BOOST_TESTED_AT(0x3003)) + || BOOST_WORKAROUND(__MWERKS__, BOOST_TESTED_AT(0x3003)) \ + || BOOST_WORKAROUND(__HP_aCC, BOOST_TESTED_AT(55500)) template regex_token_iterator_implementation(const regex_type* p, BidirectionalIterator last, const T& submatches, match_flag_type f) : end(last), pre(p), flags(f) @@ -197,7 +198,8 @@ public: } #if (BOOST_WORKAROUND(__BORLANDC__, >= 0x560) && BOOST_WORKAROUND(__BORLANDC__, BOOST_TESTED_AT(0x570)))\ || BOOST_WORKAROUND(BOOST_MSVC, < 1300) \ - || BOOST_WORKAROUND(__MWERKS__, BOOST_TESTED_AT(0x3003)) + || BOOST_WORKAROUND(__MWERKS__, BOOST_TESTED_AT(0x3003)) \ + || BOOST_WORKAROUND(__HP_aCC, BOOST_TESTED_AT(55500)) template regex_token_iterator(BidirectionalIterator a, BidirectionalIterator b, const regex_type& re, const T& submatches, match_flag_type m = match_default)