From cddfd077a86b65316a3e86314245841d849cfcd4 Mon Sep 17 00:00:00 2001 From: John Maddock Date: Sun, 20 Jul 2003 11:16:26 +0000 Subject: [PATCH] Added tentative fix for Metrowerks problem. Removed Intel test code. [SVN r19227] --- include/boost/regex/config.hpp | 15 --------------- include/boost/regex/v4/regex_token_iterator.hpp | 9 ++++++--- 2 files changed, 6 insertions(+), 18 deletions(-) diff --git a/include/boost/regex/config.hpp b/include/boost/regex/config.hpp index 4edac5b8..000c9149 100644 --- a/include/boost/regex/config.hpp +++ b/include/boost/regex/config.hpp @@ -577,21 +577,6 @@ BOOST_REGEX_DECL void BOOST_REGEX_CALL put_mem_block(void*); * ****************************************************************************/ -// -// this is a deliberate error, will be removed once it's diagnostics have been checked: -// -#if defined(BOOST_INTEL) -#if BOOST_REGEX_DECL +0 -#error "Oops1" -#endif -#if BOOST_REGEX_CALL +0 -#error "Oops2" -#endif -#if BOOST_REGEX_CCALL +0 -#error "Oops3" -#endif -#endif - #if defined(BOOST_REGEX_DIAG) # pragma message ("BOOST_REGEX_DECL set as: " BOOST_STRINGIZE(BOOST_REGEX_DECL)) # pragma message ("BOOST_REGEX_CALL set as: " BOOST_STRINGIZE(BOOST_REGEX_CALL)) diff --git a/include/boost/regex/v4/regex_token_iterator.hpp b/include/boost/regex/v4/regex_token_iterator.hpp index cd1cba8a..1211f2a8 100644 --- a/include/boost/regex/v4/regex_token_iterator.hpp +++ b/include/boost/regex/v4/regex_token_iterator.hpp @@ -26,7 +26,8 @@ #include #include #if (BOOST_WORKAROUND(__BORLANDC__, >= 0x560) && BOOST_WORKAROUND(__BORLANDC__, BOOST_TESTED_AT(0x570)))\ - || BOOST_WORKAROUND(BOOST_MSVC, < 1300) + || BOOST_WORKAROUND(BOOST_MSVC, < 1300) \ + || BOOST_WORKAROUND(__MEWERKS__, BOOST_TESTED_AT(0x3003)) // // Borland C++ Builder 6, and Visual C++ 6, // can't cope with the array template constructor @@ -62,7 +63,8 @@ public: regex_token_iterator_implementation(const regex_type* p, BidirectionalIterator last, const std::vector& v, match_flag_type f) : end(last), pre(p), subs(v), flags(f){} #if (BOOST_WORKAROUND(__BORLANDC__, >= 0x560) && BOOST_WORKAROUND(__BORLANDC__, BOOST_TESTED_AT(0x570)))\ - || BOOST_WORKAROUND(BOOST_MSVC, < 1300) + || BOOST_WORKAROUND(BOOST_MSVC, < 1300) \ + || BOOST_WORKAROUND(__MEWERKS__, BOOST_TESTED_AT(0x3003)) template regex_token_iterator_implementation(const regex_type* p, BidirectionalIterator last, const T& submatches, match_flag_type f) : end(last), pre(p), flags(f) @@ -178,7 +180,8 @@ public: pdata.reset(); } #if (BOOST_WORKAROUND(__BORLANDC__, >= 0x560) && BOOST_WORKAROUND(__BORLANDC__, BOOST_TESTED_AT(0x570)))\ - || BOOST_WORKAROUND(BOOST_MSVC, < 1300) + || BOOST_WORKAROUND(BOOST_MSVC, < 1300) \ + || BOOST_WORKAROUND(__MEWERKS__, BOOST_TESTED_AT(0x3003)) template regex_token_iterator(BidirectionalIterator a, BidirectionalIterator b, const regex_type& re, const T& submatches, match_flag_type m = match_default)