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
Simplified streamable detection
- Commit
a713ce0264a3d87c582d0e9543ef35e816cf111d- Author
- Phil Nash ·
- Parents
08a1b51987d5
Changes
include/internal/catch_capture.hpp | 70 +++++++++++--------------------------- 1 file changed, 19 insertions(+), 51 deletions(-) diff --git a/include/internal/catch_capture.hpp b/include/internal/catch_capture.hpp index 51e9d999..d857fc66 100644 --- a/include/internal/catch_capture.hpp +++ b/include/internal/catch_capture.hpp @@ -23,67 +23,35 @@ namespace Catch { + namespace Detail { - // The following code, contributed by Sam Partington, allows us to choose an implementation - // of toString() depending on whether a << overload is available - struct NonStreamable { - // allow construction from anything... - template<typename Anything> - NonStreamable(Anything) - {} + template<typename T> + NonStreamable( const T& ) + { + } }; - // a local operator<< which may be called if there isn't a better one elsewhere... - inline NonStreamable operator << ( std::ostream&, const NonStreamable& ns ) + // If the type does not have its own << overload for ostream then + // this one will be used instead + inline std::ostream& operator << ( std::ostream& ss, NonStreamable ) { - return ns; + ss << "{?}"; + return ss; } - - template<typename T> - struct IsStreamable - { - static NoType Deduce( const NonStreamable& ); - static YesType Deduce( std::ostream& ); - - enum - { - value = sizeof( Deduce( Synth<std::ostream&>() << Synth<const T&>() ) ) - == sizeof( YesType ) - }; - }; - // << is available, so use it with ostringstream to make the string - template<typename T, bool streamable> - struct StringMaker - { - /////////////////////////////////////////////////////////////////////// - static std::string apply - ( - const T& value - ) - { - std::ostringstream oss; - oss << value; - return oss.str(); - } - }; - - // << not available - use a default string template<typename T> - struct StringMaker<T, false> + inline std::string makeString + ( + const T& value + ) { - /////////////////////////////////////////////////////////////////////// - static std::string apply - ( - const T& - ) - { - return "{?}"; - } - }; + std::ostringstream oss; + oss << value; + return oss.str(); + } }// end namespace Detail @@ -94,7 +62,7 @@ std::string toString const T& value ) { - return Detail::StringMaker<T, Detail::IsStreamable<T>::value>::apply( value ); + return Detail::makeString( value ); } // Shortcut overloads