Merge branch 'master' into dev-modernize

2017-08-10 11:34:26 +02:00
parent e658bacb04 7e4038d848
commit aa42dd92d1
24 changed files with 281 additions and 42 deletions
@@ -101,6 +101,9 @@ namespace Catch {
    std::ostream& cerr() {
        return std::cerr;
    }
+    std::ostream& clog() {
+        return std::clog;
+    }
 #endif
 }