From 80587bc0887167739d1d66b46265400ad79945c9 Mon Sep 17 00:00:00 2001 From: Ryuta Kambe Date: Mon, 1 Jul 2024 18:40:49 +0900 Subject: [PATCH 1/3] fix(diagnostic_graph_aggregator): fix uselessOverride warning Signed-off-by: Ryuta Kambe --- .../src/common/graph/units.cpp | 10 ---------- .../src/common/graph/units.hpp | 3 --- 2 files changed, 13 deletions(-) diff --git a/system/diagnostic_graph_aggregator/src/common/graph/units.cpp b/system/diagnostic_graph_aggregator/src/common/graph/units.cpp index da801ae078e6c..5cc8c605df052 100644 --- a/system/diagnostic_graph_aggregator/src/common/graph/units.cpp +++ b/system/diagnostic_graph_aggregator/src/common/graph/units.cpp @@ -151,16 +151,6 @@ void MaxUnit::update_status() status_.level = std::min(level, DiagnosticStatus::ERROR); } -void ShortCircuitMaxUnit::update_status() -{ - // TODO(Takagi, Isamu): update link flags. - DiagnosticLevel level = DiagnosticStatus::OK; - for (const auto & link : links_) { - level = std::max(level, link->child()->level()); - } - status_.level = std::min(level, DiagnosticStatus::ERROR); -} - MinUnit::MinUnit(const UnitLoader & unit) : NodeUnit(unit) { links_ = unit.children(); diff --git a/system/diagnostic_graph_aggregator/src/common/graph/units.hpp b/system/diagnostic_graph_aggregator/src/common/graph/units.hpp index f478fa9ef1a2a..0537e4ef8b51b 100644 --- a/system/diagnostic_graph_aggregator/src/common/graph/units.hpp +++ b/system/diagnostic_graph_aggregator/src/common/graph/units.hpp @@ -137,9 +137,6 @@ class ShortCircuitMaxUnit : public MaxUnit public: using MaxUnit::MaxUnit; std::string type() const override { return unit_name::short_circuit_max; } - -private: - void update_status() override; }; class MinUnit : public NodeUnit From 71f5e0bf72c047b567a458cfaab44f463b8d2284 Mon Sep 17 00:00:00 2001 From: Ryuta Kambe Date: Tue, 2 Jul 2024 08:35:29 +0900 Subject: [PATCH 2/3] restore and suppress inline Signed-off-by: Ryuta Kambe --- .../src/common/graph/units.cpp | 10 ++++++++++ .../src/common/graph/units.hpp | 3 +++ 2 files changed, 13 insertions(+) diff --git a/system/diagnostic_graph_aggregator/src/common/graph/units.cpp b/system/diagnostic_graph_aggregator/src/common/graph/units.cpp index 5cc8c605df052..da801ae078e6c 100644 --- a/system/diagnostic_graph_aggregator/src/common/graph/units.cpp +++ b/system/diagnostic_graph_aggregator/src/common/graph/units.cpp @@ -151,6 +151,16 @@ void MaxUnit::update_status() status_.level = std::min(level, DiagnosticStatus::ERROR); } +void ShortCircuitMaxUnit::update_status() +{ + // TODO(Takagi, Isamu): update link flags. + DiagnosticLevel level = DiagnosticStatus::OK; + for (const auto & link : links_) { + level = std::max(level, link->child()->level()); + } + status_.level = std::min(level, DiagnosticStatus::ERROR); +} + MinUnit::MinUnit(const UnitLoader & unit) : NodeUnit(unit) { links_ = unit.children(); diff --git a/system/diagnostic_graph_aggregator/src/common/graph/units.hpp b/system/diagnostic_graph_aggregator/src/common/graph/units.hpp index 0537e4ef8b51b..917c6825b1b65 100644 --- a/system/diagnostic_graph_aggregator/src/common/graph/units.hpp +++ b/system/diagnostic_graph_aggregator/src/common/graph/units.hpp @@ -137,6 +137,9 @@ class ShortCircuitMaxUnit : public MaxUnit public: using MaxUnit::MaxUnit; std::string type() const override { return unit_name::short_circuit_max; } + +private: + void update_status() override; // cppcheck-suppress uselessOverride }; class MinUnit : public NodeUnit From d57846ab6c6e6bb51d78253ef079fb11cebd4d70 Mon Sep 17 00:00:00 2001 From: "pre-commit-ci[bot]" <66853113+pre-commit-ci[bot]@users.noreply.github.com> Date: Mon, 1 Jul 2024 23:38:30 +0000 Subject: [PATCH 3/3] style(pre-commit): autofix --- system/diagnostic_graph_aggregator/src/common/graph/units.hpp | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/system/diagnostic_graph_aggregator/src/common/graph/units.hpp b/system/diagnostic_graph_aggregator/src/common/graph/units.hpp index 917c6825b1b65..2dbb61eae4367 100644 --- a/system/diagnostic_graph_aggregator/src/common/graph/units.hpp +++ b/system/diagnostic_graph_aggregator/src/common/graph/units.hpp @@ -139,7 +139,7 @@ class ShortCircuitMaxUnit : public MaxUnit std::string type() const override { return unit_name::short_circuit_max; } private: - void update_status() override; // cppcheck-suppress uselessOverride + void update_status() override; // cppcheck-suppress uselessOverride }; class MinUnit : public NodeUnit