catch3
Progmasoft Catch3: an independently maintained C++17 test framework with a parallel runner, property checks, snapshots and structured results.
Clonegit clone https://git.progmasoft.com/catch3
Move FALLBACK_STRINGIFIER to before the enum and range fallbacks
- Commit
4c7b7d04fe304d575b7f683db33eb6a7d11ca888- Author
- Martin Hořeňovský ·
- Parents
90988f578c83
Changes
include/internal/catch_tostring.h | 13 ++++++------- 1 file changed, 6 insertions(+), 7 deletions(-) diff --git a/include/internal/catch_tostring.h b/include/internal/catch_tostring.h index 4c7f0366..81c87231 100644 --- a/include/internal/catch_tostring.h +++ b/include/internal/catch_tostring.h @@ -64,13 +64,8 @@ namespace Catch { template<typename T> typename std::enable_if< !std::is_enum<T>::value && !std::is_base_of<std::exception, T>::value, - std::string>::type convertUnstreamable( T const& value ) { -#if !defined(CATCH_CONFIG_FALLBACK_STRINGIFIER) - (void)value; + std::string>::type convertUnstreamable( T const& ) { return Detail::unprintableString; -#else - return CATCH_CONFIG_FALLBACK_STRINGIFIER(value); -#endif } template<typename T> typename std::enable_if< @@ -118,7 +113,11 @@ namespace Catch { static typename std::enable_if<!::Catch::Detail::IsStreamInsertable<Fake>::value, std::string>::type convert( const Fake& value ) { - return Detail::convertUnstreamable( value ); +#if !defined(CATCH_CONFIG_FALLBACK_STRINGIFIER) + return Detail::convertUnstreamable(value); +#else + return CATCH_CONFIG_FALLBACK_STRINGIFIER(value); +#endif } };