From ece529ae7cd5fe15d698986aabdd5faf23e333f8 Mon Sep 17 00:00:00 2001 From: Phil Nash Date: Tue, 3 Nov 2015 17:37:43 +0000 Subject: [PATCH] Fixed noexcept destructors issue --- include/internal/catch_impl.hpp | 3 +++ include/internal/catch_stream.h | 3 +++ single_include/catch.hpp | 8 +++++++- 3 files changed, 13 insertions(+), 1 deletion(-) diff --git a/include/internal/catch_impl.hpp b/include/internal/catch_impl.hpp index baabd7ab..74ac775e 100644 --- a/include/internal/catch_impl.hpp +++ b/include/internal/catch_impl.hpp @@ -49,6 +49,9 @@ namespace Catch { NonCopyable::~NonCopyable() {} IShared::~IShared() {} IStream::~IStream() CATCH_NOEXCEPT {} + FileStream::~FileStream() CATCH_NOEXCEPT {} + CoutStream::~CoutStream() CATCH_NOEXCEPT {} + DebugOutStream::~DebugOutStream() CATCH_NOEXCEPT {} StreamBufBase::~StreamBufBase() CATCH_NOEXCEPT {} IContext::~IContext() {} IResultCapture::~IResultCapture() {} diff --git a/include/internal/catch_stream.h b/include/internal/catch_stream.h index a69c841e..20acaff6 100644 --- a/include/internal/catch_stream.h +++ b/include/internal/catch_stream.h @@ -31,6 +31,7 @@ namespace Catch { mutable std::ofstream m_ofs; public: FileStream( std::string const& filename ); + virtual ~FileStream() CATCH_NOEXCEPT; public: // IStream virtual std::ostream& stream() const CATCH_OVERRIDE; }; @@ -40,6 +41,7 @@ namespace Catch { mutable std::ostream m_os; public: CoutStream(); + virtual ~CoutStream() CATCH_NOEXCEPT; public: // IStream virtual std::ostream& stream() const CATCH_OVERRIDE; @@ -51,6 +53,7 @@ namespace Catch { mutable std::ostream m_os; public: DebugOutStream(); + virtual ~DebugOutStream() CATCH_NOEXCEPT; public: // IStream virtual std::ostream& stream() const CATCH_OVERRIDE; diff --git a/single_include/catch.hpp b/single_include/catch.hpp index 5f17ee1c..c0c9db16 100644 --- a/single_include/catch.hpp +++ b/single_include/catch.hpp @@ -1,6 +1,6 @@ /* * Catch v1.2.1-develop.16 - * Generated: 2015-11-03 17:06:36.466681 + * Generated: 2015-11-03 17:37:18.144715 * ---------------------------------------------------------- * This file has been merged from multiple headers. Please don't edit it directly * Copyright (c) 2012 Two Blue Cubes Ltd. All rights reserved. @@ -3319,6 +3319,7 @@ namespace Catch { mutable std::ofstream m_ofs; public: FileStream( std::string const& filename ); + virtual ~FileStream() CATCH_NOEXCEPT; public: // IStream virtual std::ostream& stream() const CATCH_OVERRIDE; }; @@ -3327,6 +3328,7 @@ namespace Catch { mutable std::ostream m_os; public: CoutStream(); + virtual ~CoutStream() CATCH_NOEXCEPT; public: // IStream virtual std::ostream& stream() const CATCH_OVERRIDE; @@ -3337,6 +3339,7 @@ namespace Catch { mutable std::ostream m_os; public: DebugOutStream(); + virtual ~DebugOutStream() CATCH_NOEXCEPT; public: // IStream virtual std::ostream& stream() const CATCH_OVERRIDE; @@ -9874,6 +9877,9 @@ namespace Catch { NonCopyable::~NonCopyable() {} IShared::~IShared() {} IStream::~IStream() CATCH_NOEXCEPT {} + FileStream::~FileStream() CATCH_NOEXCEPT {} + CoutStream::~CoutStream() CATCH_NOEXCEPT {} + DebugOutStream::~DebugOutStream() CATCH_NOEXCEPT {} StreamBufBase::~StreamBufBase() CATCH_NOEXCEPT {} IContext::~IContext() {} IResultCapture::~IResultCapture() {}