feedc0de/boost_regex
1
0
Fork 0
forked from boostorg/regex
Code Pull Requests Activity

Disable MSVC std lib workarounds if we're really using STLPort or Apache/RW std lib.

Browse Source 
[SVN r47880]
This commit is contained in:
John Maddock
2008-07-30 09:35:44 +00:00
parent 546dd9f6fb
commit 3a15c301db
1 changed files with 3 additions and 2 deletions
Download Patch File Download Diff File Expand all files Collapse all files

5
src/wc_regex_traits.cpp
View File

@ -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> >;