From ad7445d33c5615d979458bf8205bf5031568b29d Mon Sep 17 00:00:00 2001 From: Phil Nash Date: Tue, 2 Jul 2013 08:49:29 +0100 Subject: [PATCH] build 5 - added throw() to streambuf destructor overrides (#182) --- README.md | 2 +- include/internal/catch_impl.hpp | 2 +- include/internal/catch_stream.hpp | 2 +- include/internal/catch_streambuf.h | 2 +- include/internal/catch_version.hpp | 2 +- projects/SelfTest/Baselines/approvedResults.txt | 4 ++-- single_include/catch.hpp | 12 ++++++------ 7 files changed, 13 insertions(+), 13 deletions(-) diff --git a/README.md b/README.md index 9e2c136f..b3866547 100644 --- a/README.md +++ b/README.md @@ -1,6 +1,6 @@ ![catch logo](catch-logo-small.png) -*v1.0 build 4 (master branch)* +*v1.0 build 5 (master branch)* # New release with significant changes diff --git a/include/internal/catch_impl.hpp b/include/internal/catch_impl.hpp index ff95675b..57f1f252 100644 --- a/include/internal/catch_impl.hpp +++ b/include/internal/catch_impl.hpp @@ -39,7 +39,7 @@ namespace Catch { NonCopyable::~NonCopyable() {} IShared::~IShared() {} - StreamBufBase::~StreamBufBase() {} + StreamBufBase::~StreamBufBase() throw() {} IContext::~IContext() {} IResultCapture::~IResultCapture() {} ITestCase::~ITestCase() {} diff --git a/include/internal/catch_stream.hpp b/include/internal/catch_stream.hpp index 5abde5ad..86b11d73 100644 --- a/include/internal/catch_stream.hpp +++ b/include/internal/catch_stream.hpp @@ -27,7 +27,7 @@ namespace Catch { setp( data, data + sizeof(data) ); } - ~StreamBufImpl() { + ~StreamBufImpl() throw() { sync(); } diff --git a/include/internal/catch_streambuf.h b/include/internal/catch_streambuf.h index 18b94ccb..6a601dbd 100644 --- a/include/internal/catch_streambuf.h +++ b/include/internal/catch_streambuf.h @@ -14,7 +14,7 @@ namespace Catch { class StreamBufBase : public std::streambuf { public: - virtual ~StreamBufBase(); + virtual ~StreamBufBase() throw(); }; } diff --git a/include/internal/catch_version.hpp b/include/internal/catch_version.hpp index 220ed921..1436572c 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, 4, "master" ); + Version libraryVersion( 1, 0, 5, "master" ); } #endif // TWOBLUECUBES_CATCH_VERSION_HPP_INCLUDED diff --git a/projects/SelfTest/Baselines/approvedResults.txt b/projects/SelfTest/Baselines/approvedResults.txt index 4e8c9759..d780f310 100644 --- a/projects/SelfTest/Baselines/approvedResults.txt +++ b/projects/SelfTest/Baselines/approvedResults.txt @@ -1,6 +1,6 @@ ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~ -CatchSelfTest is a Catch v1.0 b4 host application. +CatchSelfTest is a Catch v1.0 b5 host application. Run with -? for options ------------------------------------------------------------------------------- @@ -682,7 +682,7 @@ with expansion: ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~ -CatchSelfTest is a Catch v1.0 b4 host application. +CatchSelfTest is a Catch v1.0 b5 host application. Run with -? for options ------------------------------------------------------------------------------- diff --git a/single_include/catch.hpp b/single_include/catch.hpp index b11289e9..eff9862a 100644 --- a/single_include/catch.hpp +++ b/single_include/catch.hpp @@ -1,6 +1,6 @@ /* - * CATCH v1.0 build 4 (master branch) - * Generated: 2013-07-01 19:01:40.450418 + * CATCH v1.0 build 5 (master branch) + * Generated: 2013-07-02 08:47:24.946227 * ---------------------------------------------------------- * This file has been merged from multiple headers. Please don't edit it directly * Copyright (c) 2012 Two Blue Cubes Ltd. All rights reserved. @@ -1978,7 +1978,7 @@ namespace Catch { class StreamBufBase : public std::streambuf { public: - virtual ~StreamBufBase(); + virtual ~StreamBufBase() throw(); }; } @@ -1997,7 +1997,7 @@ namespace Catch { setp( data, data + sizeof(data) ); } - ~StreamBufImpl() { + ~StreamBufImpl() throw() { sync(); } @@ -6232,7 +6232,7 @@ namespace Catch { namespace Catch { // These numbers are maintained by a script - Version libraryVersion( 1, 0, 4, "master" ); + Version libraryVersion( 1, 0, 5, "master" ); } // #included from: catch_text.hpp @@ -7818,7 +7818,7 @@ namespace Catch { namespace Catch { NonCopyable::~NonCopyable() {} IShared::~IShared() {} - StreamBufBase::~StreamBufBase() {} + StreamBufBase::~StreamBufBase() throw() {} IContext::~IContext() {} IResultCapture::~IResultCapture() {} ITestCase::~ITestCase() {}