From 3bd9c769f172c3ef405e67dff6b80a5918fec3d3 Mon Sep 17 00:00:00 2001 From: scott snyder <snyder@bnl.gov> Date: Tue, 9 Feb 2021 16:13:48 +0100 Subject: [PATCH 1/2] TrigCostMonitorMT: Fix clang warning. Fix type for iteration over a map. --- Trigger/TrigMonitoring/TrigCostMonitorMT/src/TrigCostMTSvc.cxx | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/Trigger/TrigMonitoring/TrigCostMonitorMT/src/TrigCostMTSvc.cxx b/Trigger/TrigMonitoring/TrigCostMonitorMT/src/TrigCostMTSvc.cxx index 86f4dc84d87c..40107f3a0d20 100644 --- a/Trigger/TrigMonitoring/TrigCostMonitorMT/src/TrigCostMTSvc.cxx +++ b/Trigger/TrigMonitoring/TrigCostMonitorMT/src/TrigCostMTSvc.cxx @@ -459,7 +459,7 @@ StatusCode TrigCostMTSvc::generateTimeoutReport(const EventContext& context, std // Save top 5 times to the report report = "Timeout detected with the following algorithms consuming the most time: "; int algCounter = 0; - for(const std::pair<uint64_t, std::string>& p : timeToAlgMap){ + for(const std::pair<const uint64_t, std::string>& p : timeToAlgMap){ // Save time in miliseconds instead of microseconds report += p.second + " (" + std::round(p.first/3.) + " ms)"; ++algCounter; -- GitLab From 6bc9543b528b004bd74365c1a3546b49276b29e0 Mon Sep 17 00:00:00 2001 From: scott snyder <snyder@bnl.gov> Date: Tue, 9 Feb 2021 16:11:06 +0100 Subject: [PATCH 2/2] MuonRPC_CnvTools: Fix clang warnings. Missing override keywords. --- .../MuonCnv/MuonRPC_CnvTools/src/RpcRdoToPrepDataToolCore.h | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/MuonSpectrometer/MuonCnv/MuonRPC_CnvTools/src/RpcRdoToPrepDataToolCore.h b/MuonSpectrometer/MuonCnv/MuonRPC_CnvTools/src/RpcRdoToPrepDataToolCore.h index cf7c6f1e3ef3..02e8384d0b68 100755 --- a/MuonSpectrometer/MuonCnv/MuonRPC_CnvTools/src/RpcRdoToPrepDataToolCore.h +++ b/MuonSpectrometer/MuonCnv/MuonRPC_CnvTools/src/RpcRdoToPrepDataToolCore.h @@ -37,7 +37,7 @@ public: RpcRdoToPrepDataToolCore( const std::string&, const std::string&, const IInterface* ); // to allow access to the IMuonRdoToPrepDataTool interface - StatusCode queryInterface( const InterfaceID& riid, void** ppvIf ); + virtual StatusCode queryInterface( const InterfaceID& riid, void** ppvIf ) override; // setup/teardown functions, similar like those for Algorithm/Service virtual StatusCode initialize() override; @@ -47,8 +47,8 @@ public: virtual StatusCode decode( const std::vector<uint32_t>& robIds ) override; // debugging - void printInputRdo(); - void printPrepData(); + virtual void printInputRdo() override; + virtual void printPrepData() override; void printCoinData(); // to resolve possible conflicts with IProperty::interfaceID() -- GitLab