From ec7ec2aa42ca6bb5598fe0cde6b25fc75beb4ba7 Mon Sep 17 00:00:00 2001 From: Tim Wojtulewicz Date: Thu, 6 Jul 2023 15:53:55 -0700 Subject: [PATCH] Mark some overridden functions with override keyword --- src/DNS_Mgr.cc | 2 +- src/ScriptValidation.cc | 8 ++++---- src/Trigger.cc | 4 ++-- src/Type.cc | 2 +- src/analyzer/Analyzer.cc | 2 +- src/logging/WriterFrontend.cc | 2 +- src/scan.l | 4 ++-- src/telemetry/Manager.cc | 24 ++++++++++++------------ 8 files changed, 24 insertions(+), 24 deletions(-) diff --git a/src/DNS_Mgr.cc b/src/DNS_Mgr.cc index 79a93388a7..04db081327 100644 --- a/src/DNS_Mgr.cc +++ b/src/DNS_Mgr.cc @@ -1610,7 +1610,7 @@ class TestDNS_Mgr final : public DNS_Mgr { public: explicit TestDNS_Mgr(DNS_MgrMode mode) : DNS_Mgr(mode) { } - void Process(); + void Process() override; }; void TestDNS_Mgr::Process() diff --git a/src/ScriptValidation.cc b/src/ScriptValidation.cc index d13bc63c48..dfa3f68917 100644 --- a/src/ScriptValidation.cc +++ b/src/ScriptValidation.cc @@ -14,7 +14,7 @@ class BreakNextScriptValidation : public TraversalCallback public: BreakNextScriptValidation(bool _report) : report(_report) { } - TraversalCode PreStmt(const Stmt* stmt) + TraversalCode PreStmt(const Stmt* stmt) override { if ( ! StmtIsRelevant(stmt) ) return TC_CONTINUE; @@ -31,7 +31,7 @@ public: return TC_CONTINUE; } - TraversalCode PostStmt(const Stmt* stmt) + TraversalCode PostStmt(const Stmt* stmt) override { if ( ! StmtIsRelevant(stmt) ) return TC_CONTINUE; @@ -43,7 +43,7 @@ public: return TC_CONTINUE; } - TraversalCode PreFunction(const zeek::Func* func) + TraversalCode PreFunction(const zeek::Func* func) override { if ( func->Flavor() == zeek::FUNC_FLAVOR_HOOK ) ++hook_depth; @@ -53,7 +53,7 @@ public: return TC_CONTINUE; } - TraversalCode PostFunction(const zeek::Func* func) + TraversalCode PostFunction(const zeek::Func* func) override { if ( func->Flavor() == zeek::FUNC_FLAVOR_HOOK ) --hook_depth; diff --git a/src/Trigger.cc b/src/Trigger.cc index 61de461980..12cc758b84 100644 --- a/src/Trigger.cc +++ b/src/Trigger.cc @@ -31,7 +31,7 @@ public: { } - virtual TraversalCode PreExpr(const Expr*) override; + TraversalCode PreExpr(const Expr*) override; private: IDSet& globals; @@ -76,7 +76,7 @@ public: time = run_state::network_time; } - ~TriggerTimer() { Unref(trigger); } + ~TriggerTimer() override { Unref(trigger); } void Dispatch(double t, bool is_expire) override { diff --git a/src/Type.cc b/src/Type.cc index bfc4e2805d..9b53b5b200 100644 --- a/src/Type.cc +++ b/src/Type.cc @@ -1024,7 +1024,7 @@ class DirectManagedFieldInit final : public FieldInit { public: DirectManagedFieldInit(ZVal _init_val) : init_val(_init_val) { } - ~DirectManagedFieldInit() { ZVal::DeleteManagedType(init_val); } + ~DirectManagedFieldInit() override { ZVal::DeleteManagedType(init_val); } ZVal Generate() const override { diff --git a/src/analyzer/Analyzer.cc b/src/analyzer/Analyzer.cc index 40a21372e1..087102fbe2 100644 --- a/src/analyzer/Analyzer.cc +++ b/src/analyzer/Analyzer.cc @@ -20,7 +20,7 @@ public: AnalyzerTimer(Analyzer* arg_analyzer, analyzer_timer_func arg_timer, double arg_t, int arg_do_expire, zeek::detail::TimerType arg_type); - virtual ~AnalyzerTimer(); + ~AnalyzerTimer() override; void Dispatch(double t, bool is_expire) override; diff --git a/src/logging/WriterFrontend.cc b/src/logging/WriterFrontend.cc index 7fc7396f7a..b2302bbf35 100644 --- a/src/logging/WriterFrontend.cc +++ b/src/logging/WriterFrontend.cc @@ -41,7 +41,7 @@ public: { } - virtual ~RotateMessage() { delete[] rotated_path; } + ~RotateMessage() override { delete[] rotated_path; } bool Process() override { return Object()->Rotate(rotated_path, open, close, terminating); } diff --git a/src/scan.l b/src/scan.l index 08d7ccb12c..9fa8c3d118 100644 --- a/src/scan.l +++ b/src/scan.l @@ -811,11 +811,11 @@ void begin_RE() BEGIN(RE); } -class LocalNameFinder : public zeek::detail::TraversalCallback { +class LocalNameFinder final : public zeek::detail::TraversalCallback { public: LocalNameFinder() = default; - virtual zeek::detail::TraversalCode PreExpr(const zeek::detail::Expr* expr) + zeek::detail::TraversalCode PreExpr(const zeek::detail::Expr* expr) override { if ( expr->Tag() != EXPR_NAME ) return zeek::detail::TC_CONTINUE; diff --git a/src/telemetry/Manager.cc b/src/telemetry/Manager.cc index 3310a930af..9d8ee84ac5 100644 --- a/src/telemetry/Manager.cc +++ b/src/telemetry/Manager.cc @@ -320,7 +320,7 @@ public: void operator()(const broker::telemetry::metric_family_hdl* family, const broker::telemetry::dbl_counter_hdl* counter, - broker::telemetry::const_label_list labels) + broker::telemetry::const_label_list labels) override { if ( matches(family) ) metrics.emplace_back(MetricType::Counter, family, extract_label_values(labels), @@ -329,7 +329,7 @@ public: void operator()(const broker::telemetry::metric_family_hdl* family, const broker::telemetry::int_counter_hdl* counter, - broker::telemetry::const_label_list labels) + broker::telemetry::const_label_list labels) override { if ( matches(family) ) metrics.emplace_back(MetricType::Counter, family, extract_label_values(labels), @@ -338,7 +338,7 @@ public: void operator()(const broker::telemetry::metric_family_hdl* family, const broker::telemetry::dbl_gauge_hdl* gauge, - broker::telemetry::const_label_list labels) + broker::telemetry::const_label_list labels) override { if ( matches(family) ) metrics.emplace_back(MetricType::Gauge, family, extract_label_values(labels), @@ -347,7 +347,7 @@ public: void operator()(const broker::telemetry::metric_family_hdl* family, const broker::telemetry::int_gauge_hdl* gauge, - broker::telemetry::const_label_list labels) + broker::telemetry::const_label_list labels) override { if ( matches(family) ) metrics.emplace_back(MetricType::Gauge, family, extract_label_values(labels), @@ -356,14 +356,14 @@ public: void operator()(const broker::telemetry::metric_family_hdl* family, const broker::telemetry::dbl_histogram_hdl* histogram, - broker::telemetry::const_label_list labels) + broker::telemetry::const_label_list labels) override { // Ignored } void operator()(const broker::telemetry::metric_family_hdl* family, const broker::telemetry::int_histogram_hdl* histogram, - broker::telemetry::const_label_list labels) + broker::telemetry::const_label_list labels) override { // Ignored } @@ -400,35 +400,35 @@ public: void operator()(const broker::telemetry::metric_family_hdl* family, const broker::telemetry::dbl_counter_hdl* counter, - broker::telemetry::const_label_list labels) + broker::telemetry::const_label_list labels) override { // Ignored } void operator()(const broker::telemetry::metric_family_hdl* family, const broker::telemetry::int_counter_hdl* counter, - broker::telemetry::const_label_list labels) + broker::telemetry::const_label_list labels) override { // Ignored } void operator()(const broker::telemetry::metric_family_hdl* family, const broker::telemetry::dbl_gauge_hdl* gauge, - broker::telemetry::const_label_list labels) + broker::telemetry::const_label_list labels) override { // Ignored } void operator()(const broker::telemetry::metric_family_hdl* family, const broker::telemetry::int_gauge_hdl* gauge, - broker::telemetry::const_label_list labels) + broker::telemetry::const_label_list labels) override { // Ignored } void operator()(const broker::telemetry::metric_family_hdl* family, const broker::telemetry::dbl_histogram_hdl* histogram, - broker::telemetry::const_label_list labels) + broker::telemetry::const_label_list labels) override { if ( ! matches(family) ) return; @@ -452,7 +452,7 @@ public: void operator()(const broker::telemetry::metric_family_hdl* family, const broker::telemetry::int_histogram_hdl* histogram, - broker::telemetry::const_label_list labels) + broker::telemetry::const_label_list labels) override { if ( ! matches(family) ) return;