mirror of https://github.com/catchorg/Catch2.git
Simplified streamable detection
This commit is contained in:
parent
08a1b51987
commit
a713ce0264
|
@ -23,44 +23,27 @@
|
||||||
|
|
||||||
namespace Catch
|
namespace Catch
|
||||||
{
|
{
|
||||||
|
|
||||||
namespace Detail
|
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
|
struct NonStreamable
|
||||||
{
|
{
|
||||||
// allow construction from anything...
|
template<typename T>
|
||||||
template<typename Anything>
|
NonStreamable( const T& )
|
||||||
NonStreamable(Anything)
|
{
|
||||||
{}
|
}
|
||||||
};
|
};
|
||||||
|
|
||||||
// a local operator<< which may be called if there isn't a better one elsewhere...
|
// If the type does not have its own << overload for ostream then
|
||||||
inline NonStreamable operator << ( std::ostream&, const NonStreamable& ns )
|
// this one will be used instead
|
||||||
|
inline std::ostream& operator << ( std::ostream& ss, NonStreamable )
|
||||||
{
|
{
|
||||||
return ns;
|
ss << "{?}";
|
||||||
|
return ss;
|
||||||
}
|
}
|
||||||
|
|
||||||
template<typename T>
|
template<typename T>
|
||||||
struct IsStreamable
|
inline std::string makeString
|
||||||
{
|
|
||||||
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
|
const T& value
|
||||||
)
|
)
|
||||||
|
@ -69,21 +52,6 @@ namespace Detail
|
||||||
oss << value;
|
oss << value;
|
||||||
return oss.str();
|
return oss.str();
|
||||||
}
|
}
|
||||||
};
|
|
||||||
|
|
||||||
// << not available - use a default string
|
|
||||||
template<typename T>
|
|
||||||
struct StringMaker<T, false>
|
|
||||||
{
|
|
||||||
///////////////////////////////////////////////////////////////////////
|
|
||||||
static std::string apply
|
|
||||||
(
|
|
||||||
const T&
|
|
||||||
)
|
|
||||||
{
|
|
||||||
return "{?}";
|
|
||||||
}
|
|
||||||
};
|
|
||||||
|
|
||||||
}// end namespace Detail
|
}// end namespace Detail
|
||||||
|
|
||||||
|
@ -94,7 +62,7 @@ std::string toString
|
||||||
const T& value
|
const T& value
|
||||||
)
|
)
|
||||||
{
|
{
|
||||||
return Detail::StringMaker<T, Detail::IsStreamable<T>::value>::apply( value );
|
return Detail::makeString( value );
|
||||||
}
|
}
|
||||||
|
|
||||||
// Shortcut overloads
|
// Shortcut overloads
|
||||||
|
|
Loading…
Reference in New Issue