feedc0de/boost_regex
1
0
Fork 0
forked from boostorg/regex
Code Pull Requests Activity

Added tentative fix for Metrowerks problem.

Browse Source 
Removed Intel test code.


[SVN r19227]
This commit is contained in:
John Maddock
2003-07-20 11:16:26 +00:00
parent 41e54c1cf2
commit cddfd077a8
2 changed files with 6 additions and 18 deletions
Download Patch File Download Diff File Expand all files Collapse all files

15
include/boost/regex/config.hpp
View File

@ -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) #if defined(BOOST_REGEX_DIAG)
# pragma message ("BOOST_REGEX_DECL set as: " BOOST_STRINGIZE(BOOST_REGEX_DECL)) # pragma message ("BOOST_REGEX_DECL set as: " BOOST_STRINGIZE(BOOST_REGEX_DECL))
# pragma message ("BOOST_REGEX_CALL set as: " BOOST_STRINGIZE(BOOST_REGEX_CALL)) # pragma message ("BOOST_REGEX_CALL set as: " BOOST_STRINGIZE(BOOST_REGEX_CALL))

9
include/boost/regex/v4/regex_token_iterator.hpp
View File

@ -26,7 +26,8 @@
#include <boost/shared_ptr.hpp> #include <boost/shared_ptr.hpp>
#include <boost/detail/workaround.hpp> #include <boost/detail/workaround.hpp>
#if (BOOST_WORKAROUND(__BORLANDC__, >= 0x560) && BOOST_WORKAROUND(__BORLANDC__, BOOST_TESTED_AT(0x570)))\ #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, // Borland C++ Builder 6, and Visual C++ 6,
// can't cope with the array template constructor // 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<int>& v, match_flag_type f) regex_token_iterator_implementation(const regex_type* p, BidirectionalIterator last, const std::vector<int>& v, match_flag_type f)
: end(last), pre(p), subs(v), flags(f){} : end(last), pre(p), subs(v), flags(f){}
#if (BOOST_WORKAROUND(__BORLANDC__, >= 0x560) && BOOST_WORKAROUND(__BORLANDC__, BOOST_TESTED_AT(0x570)))\ #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 <class T> template <class T>
regex_token_iterator_implementation(const regex_type* p, BidirectionalIterator last, const T& submatches, match_flag_type f) regex_token_iterator_implementation(const regex_type* p, BidirectionalIterator last, const T& submatches, match_flag_type f)
: end(last), pre(p), flags(f) : end(last), pre(p), flags(f)
@ -178,7 +180,8 @@ public:
pdata.reset(); pdata.reset();
} }
#if (BOOST_WORKAROUND(__BORLANDC__, >= 0x560) && BOOST_WORKAROUND(__BORLANDC__, BOOST_TESTED_AT(0x570)))\ #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 <class T> template <class T>
regex_token_iterator(BidirectionalIterator a, BidirectionalIterator b, const regex_type& re, regex_token_iterator(BidirectionalIterator a, BidirectionalIterator b, const regex_type& re,
const T& submatches, match_flag_type m = match_default) const T& submatches, match_flag_type m = match_default)