eden-emu/Catch2
18
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

Introduce conditional wchar_t (and std::wstring) support

Browse source 
The support is turned on by default but the user might need to be able
to turn it off which is now possible by defining CATCH_CONFIG_NO_WCHAR.
This commit is contained in:
Tomas Zeman 2018-03-01 18:41:17 +01:00 • committed by Martin Hořeňovský
parent 865d5f59b4
commit 352853ed7e
8 changed files with 22 additions and 3 deletions
Download patch file Download diff file Expand all files Collapse all files

4
include/internal/catch_tostring.cpp
View file

@ -116,6 +116,7 @@ std::string StringMaker<std::string>::convert(const std::string& str) {
return s;
}
#ifdef CATCH_CONFIG_WCHAR
std::string StringMaker<std::wstring>::convert(const std::wstring& wstr) {
std::string s;
s.reserve(wstr.size());
@ -124,6 +125,7 @@ std::string StringMaker<std::wstring>::convert(const std::wstring& wstr) {
}
return ::Catch::Detail::stringify(s);
}
#endif
std::string StringMaker<char const*>::convert(char const* str) {
if (str) {
@ -139,6 +141,7 @@ std::string StringMaker<char*>::convert(char* str) {
return{ "{null string}" };
}
}
#ifdef CATCH_CONFIG_WCHAR
std::string StringMaker<wchar_t const*>::convert(wchar_t const * str) {
if (str) {
return ::Catch::Detail::stringify(std::wstring{ str });
@ -153,6 +156,7 @@ std::string StringMaker<wchar_t *>::convert(wchar_t * str) {
return{ "{null string}" };
}
}
#endif
std::string StringMaker<int>::convert(int value) {