From 6281799115135c8ca4e135a7616f33b9aa4b6346 Mon Sep 17 00:00:00 2001
From: John Maddock <john@johnmaddock.co.uk>
Date: Sat, 9 Dec 2000 11:44:27 +0000
Subject: [PATCH] regex configure tweeks.

[SVN r8409]
---
 include/boost/re_detail/regex_config.hpp | 9 +++++++--
 1 file changed, 7 insertions(+), 2 deletions(-)

diff --git a/include/boost/re_detail/regex_config.hpp b/include/boost/re_detail/regex_config.hpp
index 47595825..3031bd43 100644
--- a/include/boost/re_detail/regex_config.hpp
+++ b/include/boost/re_detail/regex_config.hpp
@@ -1140,15 +1140,18 @@ public:
 #undef wcsxfrm
 #endif
 
-#if defined(BOOST_NO_STDC_NAMESPACE) || (defined(__STL_NO_USING_FOR_GLOBAL_FUNCTIONS) && defined(__SGI_STL_PORT))
+#if defined(BOOST_NO_STDC_NAMESPACE) || (defined(std) && defined(__SGI_STL_PORT))
 //
-// fix namespaces:
+// fix namespaces,
+// note that we almost always do this for STLPort, as it doesn't always
+// catch all the wide character functions:
 namespace std{
    using ::ptrdiff_t;
    using ::size_t;
    using ::memcpy;
    using ::memmove;
    using ::memset;
+   using ::memcmp;
    using ::sprintf;
    using ::strcat;
    using ::strcmp;
@@ -1251,6 +1254,8 @@ namespace std{
 
 
 
+
+