From 7ee1a58a84cd4aa8e33b5d3c3aa5639209fbd259 Mon Sep 17 00:00:00 2001
From: John Maddock <john@johnmaddock.co.uk>
Date: Thu, 25 Aug 2005 16:27:28 +0000
Subject: [PATCH] Large patch from Ulrich Eckhardt to fix support for EVC++ 4.

[SVN r30670]
---
 include/boost/regex/v4/instances.hpp            | 5 +++--
 include/boost/regex/v4/match_flags.hpp          | 2 +-
 include/boost/regex/v4/regex_token_iterator.hpp | 2 +-
 test/regress/test_locale.cpp                    | 2 +-
 4 files changed, 6 insertions(+), 5 deletions(-)

diff --git a/include/boost/regex/v4/instances.hpp b/include/boost/regex/v4/instances.hpp
index 07243dd8..1af2bf67 100644
--- a/include/boost/regex/v4/instances.hpp
+++ b/include/boost/regex/v4/instances.hpp
@@ -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
 
 
 
+
diff --git a/include/boost/regex/v4/match_flags.hpp b/include/boost/regex/v4/match_flags.hpp
index 024c57fb..a86fe461 100644
--- a/include/boost/regex/v4/match_flags.hpp
+++ b/include/boost/regex/v4/match_flags.hpp
@@ -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;
diff --git a/include/boost/regex/v4/regex_token_iterator.hpp b/include/boost/regex/v4/regex_token_iterator.hpp
index 592944fa..7b259cd6 100644
--- a/include/boost/regex/v4/regex_token_iterator.hpp
+++ b/include/boost/regex/v4/regex_token_iterator.hpp
@@ -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)
 {
diff --git a/test/regress/test_locale.cpp b/test/regress/test_locale.cpp
index a7b8e555..1eb37cc4 100644
--- a/test/regress/test_locale.cpp
+++ b/test/regress/test_locale.cpp
@@ -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);