Read-only mirrors. Development, issues and pull requests are on GitHub.

summaryrefslogtreecommitdiffhomepage
path: root/projects
diff options
context:
space:
mode:
authorMartin Hořeňovský2017-05-21 23:40:05 +0200
committerMartin Hořeňovský2017-05-21 23:40:05 +0200
commit67914d8b8634da89cc8d37d65ca682bb14c484d8 (patch)
tree3ec4169239cd8cf5405a6cc8c067b1f726caf15f /projects
parent31f5e2ed81fd38020bd9e0be2341f46556751821 (diff)
downloadcatch3-67914d8b8634da89cc8d37d65ca682bb14c484d8.tar.gz
Move back to static StringMaker<T>::convert
This avoids some breakage from the modernization
Diffstat (limited to 'projects')
-rw-r--r--projects/SelfTest/ToStringWhich.cpp4
1 files changed, 2 insertions, 2 deletions
diff --git a/projects/SelfTest/ToStringWhich.cpp b/projects/SelfTest/ToStringWhich.cpp
index 8bd1b6f9..fc658a7a 100644
--- a/projects/SelfTest/ToStringWhich.cpp
+++ b/projects/SelfTest/ToStringWhich.cpp
@@ -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>";
}
};