Merged from develop branch

- now v1.3.0
Added noexcept to CustomStdException destructor
2025-09-16 18:15:42 +02:00 · 2015-12-04 10:19:08 +00:00 · 2015-11-20 17:09:48 +00:00 · 2015-10-26 14:47:29 +00:00 · 2015-10-22 21:49:32 +02:00 · 2015-09-26 18:06:53 -07:00
5 changed files with 8 additions and 8 deletions
--- a/README.md
+++ b/README.md
@@ -1,6 +1,6 @@
 ![catch logo](catch-logo-small.png)

-*v1.3.0-develop.4*
+*v1.3.0*

 Build status (on Travis CI) [![Build Status](https://travis-ci.org/philsquared/Catch.png)](https://travis-ci.org/philsquared/Catch)

--- a/include/internal/catch_stream.hpp
+++ b/include/internal/catch_stream.hpp
@@ -96,8 +96,7 @@ namespace Catch {
        return m_os;
    }

-
-#ifndef CATCH_CONFIG_NOSTDOUT // If you #define this you must implement this functions
+#ifndef CATCH_CONFIG_NOSTDOUT // If you #define this you must implement these functions
    std::ostream& cout() {
        return std::cout;
    }
--- a/include/internal/catch_version.hpp
+++ b/include/internal/catch_version.hpp
@@ -37,7 +37,7 @@ namespace Catch {
        return os;
    }

-    Version libraryVersion( 1, 3, 0, "develop", 4 );
+    Version libraryVersion( 1, 3, 0, "", 0 );

 }

--- a/projects/SelfTest/ExceptionTests.cpp
+++ b/projects/SelfTest/ExceptionTests.cpp
@@ -112,6 +112,7 @@ public:
    CustomStdException( const std::string& msg )
    : m_msg( msg )
    {}
+    ~CustomStdException() CATCH_NOEXCEPT {}
    
    std::string getMessage() const
    {
--- a/single_include/catch.hpp
+++ b/single_include/catch.hpp
@@ -1,6 +1,6 @@
 /*
- *  Catch v1.3.0-develop.4
- *  Generated: 2015-11-20 16:58:58.532767
+ *  Catch v1.3.0
+ *  Generated: 2015-12-04 10:18:17.055188
 *  ----------------------------------------------------------
 *  This file has been merged from multiple headers. Please don't edit it directly
 *  Copyright (c) 2012 Two Blue Cubes Ltd. All rights reserved.
@@ -6627,7 +6627,7 @@ namespace Catch {
        return m_os;
    }

-#ifndef CATCH_CONFIG_NOSTDOUT // If you #define this you must implement this functions
+#ifndef CATCH_CONFIG_NOSTDOUT // If you #define this you must implement these functions
    std::ostream& cout() {
        return std::cout;
    }
@@ -7267,7 +7267,7 @@ namespace Catch {
        return os;
    }

-    Version libraryVersion( 1, 3, 0, "develop", 4 );
+    Version libraryVersion( 1, 3, 0, "", 0 );

 }
Author	SHA1	Message	Date
Phil Nash	fdc42d0af4	Merged from develop branch - now v1.3.0	2015-12-04 10:19:08 +00:00
Phil Nash	d274fc571c	Added noexcept to CustomStdException destructor	2015-11-20 17:09:48 +00:00
Phil Nash	d758428fe2	Merge pull request #523 from nabijaczleweli/patch-1 Fix typo in catch_stream.hpp	2015-10-26 14:47:29 +00:00
Jędrzej	bc00d59a4e	Fix typo in catch_stream.hpp	2015-10-22 21:49:32 +02:00
Phil Nash	15317632f3	Revert "Fix parentheses warning on expression evaluation when using ccache" This reverts commit `7da777a4b7`.	2015-09-26 18:06:53 -07:00
Phil Nash	a28d40e941	Merge pull request #496 from segalaj/master Fix parentheses warning on expression evaluation when using ccache	2015-09-18 08:12:56 +01:00
segalaj	7da777a4b7	Fix parentheses warning on expression evaluation when using ccache	2015-09-14 14:28:34 +02:00
Phil Nash	1dd0d4c61a	Force cout/ cerr to be initialised before errors in test registry are printed - see #461	2015-07-10 07:46:19 +01:00