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

Do not introduce VTable when using the NonCopyable helper

Browse Source
This commit is contained in:
Martin Hořeňovský 2019-10-30 18:51:14 +01:00
parent ca4c6218d4
commit 7c48ea6016
No known key found for this signature in database
GPG Key ID: DE48307B8B0D381A
5 changed files with 4 additions and 12 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

5
include/internal/catch_common.cpp
View File

@ -37,7 +37,4 @@ namespace Catch {
return std::string(); return std::string();
} }
NonCopyable::NonCopyable() = default; } // end namespace Catch
NonCopyable::~NonCopyable() = default;
}

4
include/internal/catch_common.h
View File

@ -38,10 +38,8 @@ namespace Catch {
NonCopyable( NonCopyable && ) = delete; NonCopyable( NonCopyable && ) = delete;
NonCopyable& operator = ( NonCopyable const& ) = delete; NonCopyable& operator = ( NonCopyable const& ) = delete;
NonCopyable& operator = ( NonCopyable && ) = delete; NonCopyable& operator = ( NonCopyable && ) = delete;
protected: protected:
NonCopyable(); NonCopyable() noexcept = default;
virtual ~NonCopyable();
}; };
struct SourceLineInfo { struct SourceLineInfo {

4
include/internal/catch_session.h
View File

@ -20,7 +20,7 @@ namespace Catch {
public: public:
Session(); Session();
~Session() override; ~Session();
void showHelp() const; void showHelp() const;
void libIdentify(); void libIdentify();
@ -41,7 +41,7 @@ namespace Catch {
returnCode = run(); returnCode = run();
return returnCode; return returnCode;
} }
int run(); int run();
clara::Parser const& cli() const; clara::Parser const& cli() const;

2
include/internal/catch_test_registry.cpp
View File

@ -32,6 +32,4 @@ namespace Catch {
getMutableRegistryHub().registerStartupException(); getMutableRegistryHub().registerStartupException();
} }
} }
AutoReg::~AutoReg() = default;
} }

1
include/internal/catch_test_registry.h
View File

@ -44,7 +44,6 @@ struct NameAndTags {
struct AutoReg : NonCopyable { struct AutoReg : NonCopyable {
AutoReg( ITestInvoker* invoker, SourceLineInfo const& lineInfo, StringRef const& classOrMethod, NameAndTags const& nameAndTags ) noexcept; AutoReg( ITestInvoker* invoker, SourceLineInfo const& lineInfo, StringRef const& classOrMethod, NameAndTags const& nameAndTags ) noexcept;
~AutoReg();
}; };
} // end namespace Catch } // end namespace Catch