From 3a15c301db2b66cdcf33b556aaad63d729e24fef Mon Sep 17 00:00:00 2001
From: John Maddock <john@johnmaddock.co.uk>
Date: Wed, 30 Jul 2008 09:35:44 +0000
Subject: [PATCH] Disable MSVC std lib workarounds if we're really using
 STLPort or Apache/RW std lib.

[SVN r47880]
---
 src/wc_regex_traits.cpp | 5 +++--
 1 file changed, 3 insertions(+), 2 deletions(-)

diff --git a/src/wc_regex_traits.cpp b/src/wc_regex_traits.cpp
index 1de3dee6..393b2d7f 100644
--- a/src/wc_regex_traits.cpp
+++ b/src/wc_regex_traits.cpp
@@ -23,7 +23,8 @@
 #include <memory>
 #include <string>
 
-#if defined(_DLL_CPPLIB) && !defined(_M_CEE_PURE)
+#if defined(_DLL_CPPLIB) && !defined(_M_CEE_PURE) \
+   && !(defined(__SGI_STL_PORT) || defined(_STLPORT_VERSION) || defined(__STD_RWCOMPILER_H__) || defined(_RWSTD_VER))
 //
 // This is a horrible workaround, but without declaring these symbols extern we get
 // duplicate symbol errors when linking if the application is built without
@@ -38,7 +39,7 @@
 namespace std{
 
 #if BOOST_WORKAROUND(BOOST_MSVC, >= 1400)
-template BOOST_REGEX_STDLIB_DECL allocator<unsigned short>::allocator();
+template class BOOST_REGEX_STDLIB_DECL allocator<unsigned short>;
 template class BOOST_REGEX_STDLIB_DECL _String_val<unsigned short, allocator<unsigned short> >;
 template class BOOST_REGEX_STDLIB_DECL basic_string<unsigned short, char_traits<unsigned short>,
 	allocator<unsigned short> >;