3rd-party
/
catch2
mirror of https://github.com/catchorg/Catch2.git
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

Minor clean-ups in string conversion code

This commit is contained in:
Phil Nash 2017-07-19 08:16:55 +01:00
parent b0e3f45a22
commit cd6f6c021a
1 changed files with 5 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

9
include/internal/catch_tostring.h
View File

@ -35,6 +35,9 @@ namespace Catch {
using ::operator<<; using ::operator<<;
namespace Detail { namespace Detail {
extern const std::string unprintableString;
std::string rawMemoryToString( const void *object, std::size_t size ); std::string rawMemoryToString( const void *object, std::size_t size );
template<typename T> template<typename T>
@ -64,7 +67,7 @@ namespace Catch {
static static
typename std::enable_if<::Catch::Detail::IsStreamInsertable<Fake>::value, std::string>::type typename std::enable_if<::Catch::Detail::IsStreamInsertable<Fake>::value, std::string>::type
convert(const Fake& t) { convert(const Fake& t) {
std::stringstream sstr; std::ostringstream sstr;
sstr << t; sstr << t;
return sstr.str(); return sstr.str();
} }
@ -73,14 +76,12 @@ namespace Catch {
static static
typename std::enable_if<!::Catch::Detail::IsStreamInsertable<Fake>::value, std::string>::type typename std::enable_if<!::Catch::Detail::IsStreamInsertable<Fake>::value, std::string>::type
convert(const Fake&) { convert(const Fake&) {
return "{?}"; return Detail::unprintableString;
} }
}; };
namespace Detail { namespace Detail {
extern const std::string unprintableString;
// This function dispatches all stringification requests inside of Catch. // This function dispatches all stringification requests inside of Catch.
// Should be preferably called fully qualified, like ::Catch::Detail::stringify // Should be preferably called fully qualified, like ::Catch::Detail::stringify
template <typename T> template <typename T>