boostorg/functional
1
0
Fork 1
mirror of https://github.com/boostorg/functional.git synced 2025-07-31 04:57:16 +02:00
Code Issues Packages Projects Releases Wiki Activity

Only support std::wstring when wchar_t is available

Browse Source 
This hopefuly fixes #8552.

https://svn.boost.org/trac/boost/ticket/8552
This commit is contained in:
Daniel James
2016-11-18 14:53:12 +00:00
parent 3651b46104
commit f230731aa5
2 changed files with 3 additions and 3 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
hash/test/hash_string_test.cpp
View File

@ -55,7 +55,7 @@ void string0_tests()
BOOST_TEST(hasher(x3) != hasher(x4)); BOOST_TEST(hasher(x3) != hasher(x4));
} }
#if !defined(BOOST_NO_STD_WSTRING) #if !defined(BOOST_NO_STD_WSTRING) && !defined(BOOST_NO_INTRINSIC_WCHAR_T)
void wstring_tests() void wstring_tests()
{ {
compile_time_tests((std::wstring*) 0); compile_time_tests((std::wstring*) 0);
@ -84,7 +84,7 @@ int main()
{ {
string_tests(); string_tests();
string0_tests(); string0_tests();
#if !defined(BOOST_NO_STD_WSTRING) #if !defined(BOOST_NO_STD_WSTRING) && !defined(BOOST_NO_INTRINSIC_WCHAR_T)
wstring_tests(); wstring_tests();
#endif #endif
return boost::report_errors(); return boost::report_errors();

2
include/boost/functional/hash/hash.hpp
View File

@ -468,7 +468,7 @@ namespace boost
BOOST_HASH_SPECIALIZE(long double) BOOST_HASH_SPECIALIZE(long double)
BOOST_HASH_SPECIALIZE_REF(std::string) BOOST_HASH_SPECIALIZE_REF(std::string)
#if !defined(BOOST_NO_STD_WSTRING) #if !defined(BOOST_NO_STD_WSTRING) && !defined(BOOST_NO_INTRINSIC_WCHAR_T)
BOOST_HASH_SPECIALIZE_REF(std::wstring) BOOST_HASH_SPECIALIZE_REF(std::wstring)
#endif #endif