From 406917f793dc7d9144461f546942fc0dca7dd85a Mon Sep 17 00:00:00 2001 From: Marco Nilsson Date: Tue, 5 Feb 2013 09:20:45 +0100 Subject: [PATCH] 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 6498a5112cf02cddeb0b300d9ad3620159c9931f. --- include/internal/catch_tostring.hpp | 2 -- single_include/catch.hpp | 2 -- 2 files changed, 4 deletions(-) diff --git a/include/internal/catch_tostring.hpp b/include/internal/catch_tostring.hpp index 4d2be7b1..b6802af9 100644 --- a/include/internal/catch_tostring.hpp +++ b/include/internal/catch_tostring.hpp @@ -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}" ); diff --git a/single_include/catch.hpp b/single_include/catch.hpp index f5918910..cd5bd053 100644 --- a/single_include/catch.hpp +++ b/single_include/catch.hpp @@ -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}" );