mirror of
https://github.com/catchorg/Catch2.git
synced 2025-09-13 00:45:39 +02:00
Revert "Only add wstring versions of toString if wchar_t has been defined. This fixes some issues on embedded platforms where wstring isn't available."
This will be done with a simple #ifdef instead.
This reverts commit 6498a5112c
.
This commit is contained in:
@@ -73,7 +73,6 @@ inline std::string toString( const std::string& value ) {
|
||||
return "\"" + value + "\"";
|
||||
}
|
||||
|
||||
#ifdef wchar_t
|
||||
inline std::string toString( const std::wstring& value ) {
|
||||
std::ostringstream oss;
|
||||
oss << "\"";
|
||||
@@ -82,7 +81,6 @@ inline std::string toString( const std::wstring& value ) {
|
||||
oss << "\"";
|
||||
return oss.str();
|
||||
}
|
||||
#endif
|
||||
|
||||
inline std::string toString( const char* const value ) {
|
||||
return value ? Catch::toString( std::string( value ) ) : std::string( "{null string}" );
|
||||
|
@@ -545,7 +545,6 @@ inline std::string toString( const std::string& value ) {
|
||||
return "\"" + value + "\"";
|
||||
}
|
||||
|
||||
#ifdef wchar_t
|
||||
inline std::string toString( const std::wstring& value ) {
|
||||
std::ostringstream oss;
|
||||
oss << "\"";
|
||||
@@ -554,7 +553,6 @@ inline std::string toString( const std::wstring& value ) {
|
||||
oss << "\"";
|
||||
return oss.str();
|
||||
}
|
||||
#endif
|
||||
|
||||
inline std::string toString( const char* const value ) {
|
||||
return value ? Catch::toString( std::string( value ) ) : std::string( "{null string}" );
|
||||
|
Reference in New Issue
Block a user