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

Large patch from Ulrich Eckhardt to fix support for EVC++ 4.

Browse Source 
[SVN r30670]
This commit is contained in:
John Maddock
2005-08-25 16:27:28 +00:00
parent bfa2168237
commit 7ee1a58a84
4 changed files with 6 additions and 5 deletions
Download Patch File Download Diff File Expand all files Collapse all files

5
include/boost/regex/v4/instances.hpp
View File

@ -73,7 +73,7 @@ template class BOOST_REGEX_DECL basic_regex< BOOST_REGEX_CHAR_T >;
# endif
template class BOOST_REGEX_DECL basic_regex< BOOST_REGEX_CHAR_T >;
#if !BOOST_WORKAROUND(BOOST_MSVC, <= 1200)
#if !BOOST_WORKAROUND(BOOST_MSVC, < 1300)
template class BOOST_REGEX_DECL match_results< const BOOST_REGEX_CHAR_T* >;
#endif
#ifndef BOOST_NO_STD_ALLOCATOR
@ -82,7 +82,7 @@ template class BOOST_REGEX_DECL ::boost::re_detail::perl_matcher<BOOST_REGEX_CHA
#if !(defined(BOOST_DINKUMWARE_STDLIB) && (BOOST_DINKUMWARE_STDLIB <= 1))\
&& !(defined(BOOST_INTEL_CXX_VERSION) && (BOOST_INTEL_CXX_VERSION <= 800))\
&& !(defined(__SGI_STL_PORT) || defined(_STLPORT_VERSION))
#if !BOOST_WORKAROUND(BOOST_MSVC, <= 1200)
#if !BOOST_WORKAROUND(BOOST_MSVC, < 1300)
template class BOOST_REGEX_DECL match_results< std::basic_string<BOOST_REGEX_CHAR_T>::const_iterator >;
#endif
#ifndef BOOST_NO_STD_ALLOCATOR
@ -108,3 +108,4 @@ template class BOOST_REGEX_DECL ::boost::re_detail::perl_matcher< std::basic_str

2
include/boost/regex/v4/match_flags.hpp
View File

@ -73,7 +73,7 @@ typedef enum _match_flags
} match_flags;
#if BOOST_WORKAROUND(BOOST_MSVC, <= 1200) || BOOST_WORKAROUND(__BORLANDC__, BOOST_TESTED_AT(0x564))
#if BOOST_WORKAROUND(BOOST_MSVC, < 1300) || BOOST_WORKAROUND(__BORLANDC__, BOOST_TESTED_AT(0x564))
typedef unsigned long match_flag_type;
#else
typedef match_flags match_flag_type;

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

@ -286,7 +286,7 @@ inline regex_token_iterator<typename std::basic_string<charT, ST, SA>::const_ite
{
return regex_token_iterator<typename std::basic_string<charT, ST, SA>::const_iterator, charT, traits>(p.begin(), p.end(), e, submatch, m);
}
#if !BOOST_WORKAROUND(BOOST_MSVC, <= 1200)
#if !BOOST_WORKAROUND(BOOST_MSVC, < 1300)
template <class charT, class traits, std::size_t N>
inline regex_token_iterator<const charT*, charT, traits> make_regex_token_iterator(const charT* p, const basic_regex<charT, traits>& e, const int (&submatch)[N], regex_constants::match_flag_type m = regex_constants::match_default)
{

2
test/regress/test_locale.cpp
View File

@ -156,7 +156,7 @@ void test_en_locale()
// VC6 seems to have problems with std::setlocale, I've never
// gotten to the bottem of this as the program runs fine under the
// debugger, but hangs when run from bjam:
#if !BOOST_WORKAROUND(BOOST_MSVC, <=1200) && !(defined(__ICL) && defined(_MSC_VER) && (_MSC_VER == 1200))
#if !BOOST_WORKAROUND(BOOST_MSVC, <1300) && !(defined(__ICL) && defined(_MSC_VER) && (_MSC_VER == 1200))
test_en_locale("en_US", 0x09 | 0x01 << 10);
test_en_locale("en_UK", 0x09 | 0x02 << 10);
test_en_locale("en", 0x09);