From ebf9f3bb9db48148b3ee6a3b066a770e148f5ce7 Mon Sep 17 00:00:00 2001 From: Phil Nash Date: Tue, 10 May 2016 19:09:59 +0100 Subject: [PATCH] v1.5.3 --- README.md | 2 +- include/internal/catch_version.hpp | 2 +- single_include/catch.hpp | 22 ++++++++++++---------- 3 files changed, 14 insertions(+), 12 deletions(-) diff --git a/README.md b/README.md index 47d29994..db836831 100644 --- a/README.md +++ b/README.md @@ -1,6 +1,6 @@ ![catch logo](catch-logo-small.png) -*v1.5.2* +*v1.5.3* Build status (on Travis CI) [![Build Status](https://travis-ci.org/philsquared/Catch.png)](https://travis-ci.org/philsquared/Catch) diff --git a/include/internal/catch_version.hpp b/include/internal/catch_version.hpp index 3838693f..ac6701f1 100644 --- a/include/internal/catch_version.hpp +++ b/include/internal/catch_version.hpp @@ -37,7 +37,7 @@ namespace Catch { return os; } - Version libraryVersion( 1, 5, 2, "", 0 ); + Version libraryVersion( 1, 5, 3, "", 0 ); } diff --git a/single_include/catch.hpp b/single_include/catch.hpp index 350ee990..9afe69a7 100644 --- a/single_include/catch.hpp +++ b/single_include/catch.hpp @@ -1,6 +1,6 @@ /* - * Catch v1.5.2 - * Generated: 2016-05-07 23:13:51.221005 + * Catch v1.5.3 + * Generated: 2016-05-10 19:09:28.805441 * ---------------------------------------------------------- * This file has been merged from multiple headers. Please don't edit it directly * Copyright (c) 2012 Two Blue Cubes Ltd. All rights reserved. @@ -6480,13 +6480,15 @@ namespace Catch { it != itEnd; ++it ) { std::pair::const_iterator, bool> prev = seenFunctions.insert( *it ); - if( !prev.second ){ - Catch::cerr() - << Colour( Colour::Red ) - << "error: TEST_CASE( \"" << it->name << "\" ) already defined.\n" - << "\tFirst seen at " << prev.first->getTestCaseInfo().lineInfo << "\n" - << "\tRedefined at " << it->getTestCaseInfo().lineInfo << std::endl; - exit(1); + if( !prev.second ) { + std::ostringstream ss; + + ss << Colour( Colour::Red ) + << "error: TEST_CASE( \"" << it->name << "\" ) already defined.\n" + << "\tFirst seen at " << prev.first->getTestCaseInfo().lineInfo << "\n" + << "\tRedefined at " << it->getTestCaseInfo().lineInfo << std::endl; + + throw std::runtime_error(ss.str()); } } } @@ -7545,7 +7547,7 @@ namespace Catch { return os; } - Version libraryVersion( 1, 5, 2, "", 0 ); + Version libraryVersion( 1, 5, 3, "", 0 ); }