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 conversion after enum-check
- Commit
da783abee94d718ab7c2954b2f016a858263f69b- Author
- Martin Hořeňovský ·
- Parents
c0267e5c20c2
Changes
include/internal/catch_tostring.h | 11 ++++++----- 1 file changed, 6 insertions(+), 5 deletions(-) diff --git a/include/internal/catch_tostring.h b/include/internal/catch_tostring.h index 89909906..bb9cb0be 100644 --- a/include/internal/catch_tostring.h +++ b/include/internal/catch_tostring.h @@ -61,8 +61,13 @@ namespace Catch { std::string convertUnknownEnumToString( E e ); template<typename T> - typename std::enable_if<!std::is_enum<T>::value, std::string>::type convertUnstreamable( T const& ) { + typename std::enable_if<!std::is_enum<T>::value, std::string>::type convertUnstreamable( T const& value ) { +#if !defined(CATCH_CONFIG_FALLBACK_STRINGIFIER) + (void)value; return Detail::unprintableString; +#else + return CATCH_CONFIG_FALLBACK_STRINGIFIER(value); +#endif } template<typename T> typename std::enable_if<std::is_enum<T>::value, std::string>::type convertUnstreamable( T const& value ) { @@ -88,11 +93,7 @@ namespace Catch { static typename std::enable_if<!::Catch::Detail::IsStreamInsertable<Fake>::value, std::string>::type convert( const Fake& value ) { -#if !defined(CATCH_CONFIG_FALLBACK_STRINGIFIER) return Detail::convertUnstreamable( value ); -#else - return CATCH_CONFIG_FALLBACK_STRINGIFIER( value ); -#endif } };