From 2bc1f9c998dbc4c1fb1b22afee23487e22550738 Mon Sep 17 00:00:00 2001
From: John Maddock <john@johnmaddock.co.uk>
Date: Fri, 21 Sep 2001 11:35:54 +0000
Subject: [PATCH] More fixes resulting from the new config

[SVN r11182]
---
 src/w32_regex_traits.cpp |  5 +++--
 test/regress/regress.h   | 12 +++++-------
 2 files changed, 8 insertions(+), 9 deletions(-)

diff --git a/src/w32_regex_traits.cpp b/src/w32_regex_traits.cpp
index 4f3db528..6dcbe99c 100644
--- a/src/w32_regex_traits.cpp
+++ b/src/w32_regex_traits.cpp
@@ -35,9 +35,10 @@
 #if defined(_WIN32) && !defined(BOOST_REGEX_NO_W32)
 
 //
-// VC6 needs to link to user32.lib:
+// VC6 needs to link to user32.lib, as do all compilers that
+// claim to be VC6/7 compatible:
 //
-#ifdef BOOST_MSVC
+#if defined(_MSC_VER) && !defined(__BORLANDC__)
 #pragma comment(lib, "user32.lib")
 #endif
 
diff --git a/test/regress/regress.h b/test/regress/regress.h
index 7de46dfa..f4d4e549 100644
--- a/test/regress/regress.h
+++ b/test/regress/regress.h
@@ -162,10 +162,10 @@ public:
    { return size_t(-1) / sizeof(value_type); }
 
    void construct(pointer p, const T& val) const
-   { allocator_construct(p, val); }
+   { boost::detail::allocator_construct(p, val); }
 
-   void destroy(pointer __p) const
-   { allocator_destroy(p); }
+   void destroy(pointer p) const
+   { boost::detail::allocator_destroy(p); }
 
 #ifndef BOOST_NO_MEMBER_TEMPLATES
    template <class U>
@@ -229,12 +229,10 @@ public:
    }
 
    static void construct(pointer , const char& )
-   {
-   }
+   { boost::detail::allocator_construct(p, val); }
 
    static void destroy(pointer )
-   {
-   }
+   { boost::detail::allocator_destroy(p); }
 };
 
 #ifdef __BORLANDC__