From da99b16a875a57a5a6d03faaecf57540769cc4c7 Mon Sep 17 00:00:00 2001 From: John Maddock Date: Mon, 22 May 2006 17:50:33 +0000 Subject: [PATCH] Don't apply fix to VC7. [SVN r34060] --- src/usinstances.cpp | 3 +++ 1 file changed, 3 insertions(+) diff --git a/src/usinstances.cpp b/src/usinstances.cpp index 35400006..7546c621 100644 --- a/src/usinstances.cpp +++ b/src/usinstances.cpp @@ -24,6 +24,7 @@ #define BOOST_REGEX_US_INSTANTIATE #ifdef _DLL_CPPLIB +#include // // This is a horrible workaround, without declaring these symbols extern we get // duplicate symbol errors when linking if the application is built without @@ -45,7 +46,9 @@ template _CRTIMP2 bool __cdecl operator<( template _CRTIMP2 bool __cdecl operator>( const basic_string, allocator >&, const basic_string, allocator >&); +#if BOOST_WORKAROUND(BOOST_MSVC, > 1300) && BOOST_WORKAROUND(BOOST_MSVC, BOOST_TESTED_AT(1400) template<> _CRTIMP2 std::size_t __cdecl char_traits::length(unsigned short const*); +#endif } #endif