From 09a8e172bd0a38d704bdfb57958acb0c1a1657a3 Mon Sep 17 00:00:00 2001 From: John Maddock Date: Mon, 22 Sep 2003 10:56:29 +0000 Subject: [PATCH] Fixed MSVC-stlport build issues [SVN r20149] --- src/cpp_regex_traits.cpp | 4 +++- 1 file changed, 3 insertions(+), 1 deletion(-) diff --git a/src/cpp_regex_traits.cpp b/src/cpp_regex_traits.cpp index 00b8c4a4..ec993d45 100644 --- a/src/cpp_regex_traits.cpp +++ b/src/cpp_regex_traits.cpp @@ -254,8 +254,9 @@ message_data::message_data(const std::locale& l, const std::string& regex_ // STLport users as well (gcc3.1+STLport5), so enable the // workaround for all STLport users... // -#if defined(__SGI_STL_PORT) || defined(_STLPORT_VERSION) +#if (defined(__SGI_STL_PORT) || defined(_STLPORT_VERSION)) && !defined(BOOST_MSVC) using namespace std; + using stlport::isspace; # define BOOST_REGEX_STD #else # define BOOST_REGEX_STD std:: @@ -878,3 +879,4 @@ std::size_t BOOST_REGEX_CALL cpp_regex_traits::strwiden(wchar_t *s1, st #endif +