Progmasoft Git

catch3

Progmasoft Catch3: an independently maintained C++17 test framework with a parallel runner, property checks, snapshots and structured results.

Clonegit clone https://git.progmasoft.com/catch3

Fixes toString forward reference issue:

- as raised in https://github.com/philsquared/Catch/pull/195
Commit
1e2f1d160336be07411775c476bfed3c7673263f
Author
Phil Nash ·
Parents
f7378eebb6dd

Files · Download .tar.gz

Changes

 README.md                                                | 2 +-
 include/internal/catch_approx.hpp                        | 2 +-
 include/internal/catch_capture.hpp                       | 1 +
 include/internal/catch_exception_translator_registry.hpp | 1 +
 include/internal/catch_expression_lhs.hpp                | 1 +
 include/internal/catch_tostring.hpp                      | 3 +++
 include/internal/catch_version.hpp                       | 2 +-
 include/reporters/catch_reporter_junit.hpp               | 2 +-
 projects/SelfTest/Baselines/approvedResults.txt          | 4 ++--
 single_include/catch.hpp                                 | 9 ++++++---
 10 files changed, 18 insertions(+), 9 deletions(-)

diff --git a/README.md b/README.md
index 166a28cb..402c21c8 100644
--- a/README.md
+++ b/README.md
@@ -1,6 +1,6 @@
 ![catch logo](catch-logo-small.png)
 
-*v1.0 build 9 (master branch)*
+*v1.0 build 10 (master branch)*
 
 # New release with significant changes
 
diff --git a/include/internal/catch_approx.hpp b/include/internal/catch_approx.hpp
index b2d7d555..67dba619 100644
--- a/include/internal/catch_approx.hpp
+++ b/include/internal/catch_approx.hpp
@@ -8,7 +8,7 @@
 #ifndef TWOBLUECUBES_CATCH_APPROX_HPP_INCLUDED
 #define TWOBLUECUBES_CATCH_APPROX_HPP_INCLUDED
 
-#include "catch_capture.hpp"
+#include "catch_tostring.hpp"
 
 #include <cmath>
 #include <limits>
diff --git a/include/internal/catch_capture.hpp b/include/internal/catch_capture.hpp
index a934abb1..849dee97 100644
--- a/include/internal/catch_capture.hpp
+++ b/include/internal/catch_capture.hpp
@@ -15,6 +15,7 @@
 #include "catch_debugger.hpp"
 #include "catch_context.h"
 #include "catch_common.h"
+#include "catch_tostring.hpp"
 #include "catch_interfaces_registry_hub.h"
 #include "internal/catch_compiler_capabilities.h"
 
diff --git a/include/internal/catch_exception_translator_registry.hpp b/include/internal/catch_exception_translator_registry.hpp
index d3c11dc8..50e4b6e0 100644
--- a/include/internal/catch_exception_translator_registry.hpp
+++ b/include/internal/catch_exception_translator_registry.hpp
@@ -9,6 +9,7 @@
 #define TWOBLUECUBES_CATCH_EXCEPTION_TRANSLATOR_REGISTRY_HPP_INCLUDED
 
 #include "catch_interfaces_exception.h"
+#include "catch_tostring.hpp"
 
 #ifdef __OBJC__
 #import "Foundation/Foundation.h"
diff --git a/include/internal/catch_expression_lhs.hpp b/include/internal/catch_expression_lhs.hpp
index 8241ae26..271e8dcb 100644
--- a/include/internal/catch_expression_lhs.hpp
+++ b/include/internal/catch_expression_lhs.hpp
@@ -10,6 +10,7 @@
 
 #include "catch_expressionresult_builder.h"
 #include "catch_evaluate.hpp"
+#include "catch_tostring.hpp"
 
 namespace Catch {
 
diff --git a/include/internal/catch_tostring.hpp b/include/internal/catch_tostring.hpp
index f4b044fe..78c725ec 100644
--- a/include/internal/catch_tostring.hpp
+++ b/include/internal/catch_tostring.hpp
@@ -80,6 +80,9 @@ namespace Detail {
 
 } // end namespace Detail
 
+template<typename T>
+std::string toString( T const& value );
+
 template<typename T>
 struct StringMaker :
     Detail::StringMakerBase<Detail::IsStreamInsertable<T>::value> {};
diff --git a/include/internal/catch_version.hpp b/include/internal/catch_version.hpp
index b2311fba..622709d7 100644
--- a/include/internal/catch_version.hpp
+++ b/include/internal/catch_version.hpp
@@ -13,7 +13,7 @@
 namespace Catch {
 
     // These numbers are maintained by a script
-    Version libraryVersion( 1, 0, 9, "master" );
+    Version libraryVersion( 1, 0, 10, "master" );
 }
 
 #endif // TWOBLUECUBES_CATCH_VERSION_HPP_INCLUDED
diff --git a/include/reporters/catch_reporter_junit.hpp b/include/reporters/catch_reporter_junit.hpp
index 8418e1ce..c9cf9293 100644
--- a/include/reporters/catch_reporter_junit.hpp
+++ b/include/reporters/catch_reporter_junit.hpp
@@ -8,7 +8,7 @@
 #ifndef TWOBLUECUBES_CATCH_REPORTER_JUNIT_HPP_INCLUDED
 #define TWOBLUECUBES_CATCH_REPORTER_JUNIT_HPP_INCLUDED
 
-#include "../internal/catch_capture.hpp"
+#include "../internal/catch_tostring.hpp"
 #include "../internal/catch_interfaces_reporter.h"
 #include "../internal/catch_reporter_registrars.hpp"
 #include "../internal/catch_xmlwriter.hpp"
diff --git a/projects/SelfTest/Baselines/approvedResults.txt b/projects/SelfTest/Baselines/approvedResults.txt
index 5e629d97..cc70365c 100644
--- a/projects/SelfTest/Baselines/approvedResults.txt
+++ b/projects/SelfTest/Baselines/approvedResults.txt
@@ -1,6 +1,6 @@
 
 ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~
-CatchSelfTest is a Catch v1.0 b9 host application.
+CatchSelfTest is a Catch v1.0 b10 host application.
 Run with -? for options
 
 -------------------------------------------------------------------------------
@@ -712,7 +712,7 @@ with expansion:
 
 
 ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~
-CatchSelfTest is a Catch v1.0 b9 host application.
+CatchSelfTest is a Catch v1.0 b10 host application.
 Run with -? for options
 
 -------------------------------------------------------------------------------
diff --git a/single_include/catch.hpp b/single_include/catch.hpp
index e8f2dcf1..523fa088 100644
--- a/single_include/catch.hpp
+++ b/single_include/catch.hpp
@@ -1,6 +1,6 @@
 /*
- *  CATCH v1.0 build 9 (master branch)
- *  Generated: 2013-09-07 12:04:25.989589
+ *  CATCH v1.0 build 10 (master branch)
+ *  Generated: 2013-09-14 19:56:34.776409
  *  ----------------------------------------------------------
  *  This file has been merged from multiple headers. Please don't edit it directly
  *  Copyright (c) 2012 Two Blue Cubes Ltd. All rights reserved.
@@ -703,6 +703,9 @@ namespace Detail {
 
 } // end namespace Detail
 
+template<typename T>
+std::string toString( T const& value );
+
 template<typename T>
 struct StringMaker :
     Detail::StringMakerBase<Detail::IsStreamInsertable<T>::value> {};
@@ -6352,7 +6355,7 @@ namespace Catch {
 namespace Catch {
 
     // These numbers are maintained by a script
-    Version libraryVersion( 1, 0, 9, "master" );
+    Version libraryVersion( 1, 0, 10, "master" );
 }
 
 // #included from: catch_text.hpp