3rd-party/catch2
1
0
Fork 0
mirror of https://github.com/catchorg/Catch2.git synced 2025-11-04 14:09:33 +01:00
Code Issues Packages Projects Releases Wiki Activity

Only add wstring versions of toString if wchar_t has been defined. This fixes some issues on embedded platforms where wstring isn't available.

Browse Source
This commit is contained in:
Marco Nilsson
2012-12-19 10:38:03 +01:00
parent cf5ced59d1
commit 6498a5112c
2 changed files with 4 additions and 0 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
include/internal/catch_tostring.hpp
View File

@@ -73,6 +73,7 @@ inline std::string toString( const std::string& value ) {
return "\"" + value + "\""; return "\"" + value + "\"";
} }
#ifdef wchar_t
inline std::string toString( const std::wstring& value ) { inline std::string toString( const std::wstring& value ) {
std::ostringstream oss; std::ostringstream oss;
oss << "\""; oss << "\"";
@@ -81,6 +82,7 @@ inline std::string toString( const std::wstring& value ) {
oss << "\""; oss << "\"";
return oss.str(); return oss.str();
} }
#endif
inline std::string toString( const char* const value ) { inline std::string toString( const char* const value ) {
return value ? Catch::toString( std::string( value ) ) : std::string( "{null string}" ); return value ? Catch::toString( std::string( value ) ) : std::string( "{null string}" );

2
single_include/catch.hpp
View File

@@ -545,6 +545,7 @@ inline std::string toString( const std::string& value ) {
return "\"" + value + "\""; return "\"" + value + "\"";
} }
#ifdef wchar_t
inline std::string toString( const std::wstring& value ) { inline std::string toString( const std::wstring& value ) {
std::ostringstream oss; std::ostringstream oss;
oss << "\""; oss << "\"";
@@ -553,6 +554,7 @@ inline std::string toString( const std::wstring& value ) {
oss << "\""; oss << "\"";
return oss.str(); return oss.str();
} }
#endif
inline std::string toString( const char* const value ) { inline std::string toString( const char* const value ) {
return value ? Catch::toString( std::string( value ) ) : std::string( "{null string}" ); return value ? Catch::toString( std::string( value ) ) : std::string( "{null string}" );