diff --git a/include/internal/catch_tostring.h b/include/internal/catch_tostring.h index 5ca019fc..0bcf6bbb 100644 --- a/include/internal/catch_tostring.h +++ b/include/internal/catch_tostring.h @@ -136,6 +136,18 @@ namespace Catch { static std::string convert(wchar_t * str); }; + template + struct is_string_array : std::false_type {}; + + template + struct is_string_array : std::true_type {}; + + template + struct is_string_array : std::true_type {}; + + template + struct is_string_array : std::true_type {}; + template struct StringMaker { static std::string convert(const char* str) { @@ -387,7 +399,7 @@ namespace Catch { } template - struct StringMaker::value>::type> { + struct StringMaker::value && !is_string_array::value>::type> { static std::string convert( R const& range ) { return rangeToString( range ); }