mirror of
https://github.com/boostorg/regex.git
synced 2025-07-17 22:32:09 +02:00
Fix for duplicate symbol errors when using VC7.1 without /Zc:wchar_t
[SVN r33706]
This commit is contained in:
@ -24,6 +24,11 @@
|
|||||||
#define BOOST_REGEX_US_INSTANTIATE
|
#define BOOST_REGEX_US_INSTANTIATE
|
||||||
|
|
||||||
#ifdef _DLL_CPPLIB
|
#ifdef _DLL_CPPLIB
|
||||||
|
//
|
||||||
|
// This is a horrible workaround, without declaring these symbols extern we get
|
||||||
|
// duplicate symbol errors when linking if the application is built without
|
||||||
|
// /Zc:wchar_t
|
||||||
|
//
|
||||||
namespace std{
|
namespace std{
|
||||||
template _CRTIMP2 bool __cdecl operator==(
|
template _CRTIMP2 bool __cdecl operator==(
|
||||||
const basic_string<unsigned short, char_traits<unsigned short>, allocator<unsigned short> >&,
|
const basic_string<unsigned short, char_traits<unsigned short>, allocator<unsigned short> >&,
|
||||||
@ -40,6 +45,7 @@ template _CRTIMP2 bool __cdecl operator<(
|
|||||||
template _CRTIMP2 bool __cdecl operator>(
|
template _CRTIMP2 bool __cdecl operator>(
|
||||||
const basic_string<unsigned short, char_traits<unsigned short>, allocator<unsigned short> >&,
|
const basic_string<unsigned short, char_traits<unsigned short>, allocator<unsigned short> >&,
|
||||||
const basic_string<unsigned short, char_traits<unsigned short>, allocator<unsigned short> >&);
|
const basic_string<unsigned short, char_traits<unsigned short>, allocator<unsigned short> >&);
|
||||||
|
template<> _CRTIMP2 std::size_t __cdecl char_traits<unsigned short>::length(unsigned short const*);
|
||||||
}
|
}
|
||||||
#endif
|
#endif
|
||||||
|
|
||||||
|
Reference in New Issue
Block a user