Move back to static StringMaker<T>::convert

This avoids some breakage from the modernization
This commit is contained in:
Martin Hořeňovský
2017-05-21 23:40:05 +02:00
parent 31f5e2ed81
commit 67914d8b86
5 changed files with 66 additions and 64 deletions

View File

@@ -22,13 +22,13 @@ std::ostream& operator<<(std::ostream& os, const has_maker_and_operator&) {
namespace Catch {
template<>
struct StringMaker<has_maker> {
std::string operator()( const has_maker& ) {
static std::string convert( const has_maker& ) {
return "StringMaker<has_maker>";
}
};
template<>
struct StringMaker<has_maker_and_operator> {
std::string operator()( const has_maker_and_operator& ) {
static std::string convert( const has_maker_and_operator& ) {
return "StringMaker<has_maker_and_operator>";
}
};