From 7752229105c85126712cb0b9d252a57c2ff79851 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Martin=20Ho=C5=99e=C5=88ovsk=C3=BD?= Date: Mon, 2 May 2022 10:45:02 +0200 Subject: [PATCH] Add -Wsuggest-destructor-override to enabled warnings --- CMake/CatchMiscFunctions.cmake | 1 + examples/210-Evt-EventListeners.cpp | 2 +- src/catch2/internal/catch_context.hpp | 2 +- src/catch2/internal/catch_istream.cpp | 2 +- src/catch2/internal/catch_run_context.cpp | 2 +- src/catch2/matchers/catch_matchers_templated.hpp | 2 +- 6 files changed, 6 insertions(+), 5 deletions(-) diff --git a/CMake/CatchMiscFunctions.cmake b/CMake/CatchMiscFunctions.cmake index a4f5e9a8..92530434 100644 --- a/CMake/CatchMiscFunctions.cmake +++ b/CMake/CatchMiscFunctions.cmake @@ -73,6 +73,7 @@ function(add_warnings_to_targets targets) "-Wreturn-std-move" "-Wshadow" "-Wstrict-aliasing" + "-Wsuggest-destructor-override" "-Wsuggest-override" "-Wundef" "-Wuninitialized" diff --git a/examples/210-Evt-EventListeners.cpp b/examples/210-Evt-EventListeners.cpp index 956d3c3e..e382c105 100644 --- a/examples/210-Evt-EventListeners.cpp +++ b/examples/210-Evt-EventListeners.cpp @@ -308,7 +308,7 @@ struct MyListener : Catch::EventListenerBase { using EventListenerBase::EventListenerBase; // inherit constructor // Get rid of Wweak-tables - ~MyListener(); + ~MyListener() override; // The whole test run starting void testRunStarting( Catch::TestRunInfo const& testRunInfo ) override { diff --git a/src/catch2/internal/catch_context.hpp b/src/catch2/internal/catch_context.hpp index 45901739..5b640396 100644 --- a/src/catch2/internal/catch_context.hpp +++ b/src/catch2/internal/catch_context.hpp @@ -23,7 +23,7 @@ namespace Catch { class IMutableContext : public IContext { public: - virtual ~IMutableContext(); // = default + ~IMutableContext() override; // = default virtual void setResultCapture( IResultCapture* resultCapture ) = 0; virtual void setConfig( IConfig const* config ) = 0; diff --git a/src/catch2/internal/catch_istream.cpp b/src/catch2/internal/catch_istream.cpp index 656813b3..4cd35058 100644 --- a/src/catch2/internal/catch_istream.cpp +++ b/src/catch2/internal/catch_istream.cpp @@ -33,7 +33,7 @@ namespace Detail { setp( data, data + sizeof(data) ); } - ~StreamBufImpl() noexcept { + ~StreamBufImpl() noexcept override { StreamBufImpl::sync(); } diff --git a/src/catch2/internal/catch_run_context.cpp b/src/catch2/internal/catch_run_context.cpp index 6a32cdc1..872783c6 100644 --- a/src/catch2/internal/catch_run_context.cpp +++ b/src/catch2/internal/catch_run_context.cpp @@ -32,7 +32,7 @@ namespace Catch { GeneratorTracker( TestCaseTracking::NameAndLocation const& nameAndLocation, TrackerContext& ctx, ITracker* parent ) : TrackerBase( nameAndLocation, ctx, parent ) {} - ~GeneratorTracker(); + ~GeneratorTracker() override; static GeneratorTracker& acquire( TrackerContext& ctx, TestCaseTracking::NameAndLocation const& nameAndLocation ) { GeneratorTracker* tracker; diff --git a/src/catch2/matchers/catch_matchers_templated.hpp b/src/catch2/matchers/catch_matchers_templated.hpp index 2673a3af..8c7804ce 100644 --- a/src/catch2/matchers/catch_matchers_templated.hpp +++ b/src/catch2/matchers/catch_matchers_templated.hpp @@ -22,7 +22,7 @@ namespace Matchers { class MatcherGenericBase : public MatcherUntypedBase { public: MatcherGenericBase() = default; - virtual ~MatcherGenericBase(); // = default; + ~MatcherGenericBase() override; // = default; MatcherGenericBase(MatcherGenericBase&) = default; MatcherGenericBase(MatcherGenericBase&&) = default;