3rd-party/catch2
1
0
Fork 0
mirror of https://github.com/catchorg/Catch2.git synced 2024-11-22 13:26:10 +01:00
Code Issues Packages Projects Releases Wiki Activity

Fixed noexcept destructors issue

Browse Source
This commit is contained in:
Phil Nash 2015-11-03 17:37:43 +00:00
parent 9e42153fe5
commit ece529ae7c
3 changed files with 13 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

3
include/internal/catch_impl.hpp
View File

@ -49,6 +49,9 @@ namespace Catch {
NonCopyable::~NonCopyable() {} NonCopyable::~NonCopyable() {}
IShared::~IShared() {} IShared::~IShared() {}
IStream::~IStream() CATCH_NOEXCEPT {} IStream::~IStream() CATCH_NOEXCEPT {}
FileStream::~FileStream() CATCH_NOEXCEPT {}
CoutStream::~CoutStream() CATCH_NOEXCEPT {}
DebugOutStream::~DebugOutStream() CATCH_NOEXCEPT {}
StreamBufBase::~StreamBufBase() CATCH_NOEXCEPT {} StreamBufBase::~StreamBufBase() CATCH_NOEXCEPT {}
IContext::~IContext() {} IContext::~IContext() {}
IResultCapture::~IResultCapture() {} IResultCapture::~IResultCapture() {}

3
include/internal/catch_stream.h
View File

@ -31,6 +31,7 @@ namespace Catch {
mutable std::ofstream m_ofs; mutable std::ofstream m_ofs;
public: public:
FileStream( std::string const& filename ); FileStream( std::string const& filename );
virtual ~FileStream() CATCH_NOEXCEPT;
public: // IStream public: // IStream
virtual std::ostream& stream() const CATCH_OVERRIDE; virtual std::ostream& stream() const CATCH_OVERRIDE;
}; };
@ -40,6 +41,7 @@ namespace Catch {
mutable std::ostream m_os; mutable std::ostream m_os;
public: public:
CoutStream(); CoutStream();
virtual ~CoutStream() CATCH_NOEXCEPT;
public: // IStream public: // IStream
virtual std::ostream& stream() const CATCH_OVERRIDE; virtual std::ostream& stream() const CATCH_OVERRIDE;
@ -51,6 +53,7 @@ namespace Catch {
mutable std::ostream m_os; mutable std::ostream m_os;
public: public:
DebugOutStream(); DebugOutStream();
virtual ~DebugOutStream() CATCH_NOEXCEPT;
public: // IStream public: // IStream
virtual std::ostream& stream() const CATCH_OVERRIDE; virtual std::ostream& stream() const CATCH_OVERRIDE;

8
single_include/catch.hpp
View File

@ -1,6 +1,6 @@
/* /*
* Catch v1.2.1-develop.16 * 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 * This file has been merged from multiple headers. Please don't edit it directly
* Copyright (c) 2012 Two Blue Cubes Ltd. All rights reserved. * Copyright (c) 2012 Two Blue Cubes Ltd. All rights reserved.
@ -3319,6 +3319,7 @@ namespace Catch {
mutable std::ofstream m_ofs; mutable std::ofstream m_ofs;
public: public:
FileStream( std::string const& filename ); FileStream( std::string const& filename );
virtual ~FileStream() CATCH_NOEXCEPT;
public: // IStream public: // IStream
virtual std::ostream& stream() const CATCH_OVERRIDE; virtual std::ostream& stream() const CATCH_OVERRIDE;
}; };
@ -3327,6 +3328,7 @@ namespace Catch {
mutable std::ostream m_os; mutable std::ostream m_os;
public: public:
CoutStream(); CoutStream();
virtual ~CoutStream() CATCH_NOEXCEPT;
public: // IStream public: // IStream
virtual std::ostream& stream() const CATCH_OVERRIDE; virtual std::ostream& stream() const CATCH_OVERRIDE;
@ -3337,6 +3339,7 @@ namespace Catch {
mutable std::ostream m_os; mutable std::ostream m_os;
public: public:
DebugOutStream(); DebugOutStream();
virtual ~DebugOutStream() CATCH_NOEXCEPT;
public: // IStream public: // IStream
virtual std::ostream& stream() const CATCH_OVERRIDE; virtual std::ostream& stream() const CATCH_OVERRIDE;
@ -9874,6 +9877,9 @@ namespace Catch {
NonCopyable::~NonCopyable() {} NonCopyable::~NonCopyable() {}
IShared::~IShared() {} IShared::~IShared() {}
IStream::~IStream() CATCH_NOEXCEPT {} IStream::~IStream() CATCH_NOEXCEPT {}
FileStream::~FileStream() CATCH_NOEXCEPT {}
CoutStream::~CoutStream() CATCH_NOEXCEPT {}
DebugOutStream::~DebugOutStream() CATCH_NOEXCEPT {}
StreamBufBase::~StreamBufBase() CATCH_NOEXCEPT {} StreamBufBase::~StreamBufBase() CATCH_NOEXCEPT {}
IContext::~IContext() {} IContext::~IContext() {}
IResultCapture::~IResultCapture() {} IResultCapture::~IResultCapture() {}