From 20f767706a2060886cfbb9be9549f723987e8fc0 Mon Sep 17 00:00:00 2001
From: Shaun Roe <shaun.roe@cern.ch>
Date: Tue, 20 Jul 2021 20:37:15 +0000
Subject: [PATCH] 22.0-cppcheck-SCT_ConditionsAlgorithms
---
.../src/SCT_DetectorElementCondAlg.cxx | 4 ++--
.../SCT_ConditionsTools/src/SCT_ByteStreamErrorsTool.cxx | 2 +-
2 files changed, 3 insertions(+), 3 deletions(-)
diff --git a/InnerDetector/InDetConditions/SCT_ConditionsAlgorithms/src/SCT_DetectorElementCondAlg.cxx b/InnerDetector/InDetConditions/SCT_ConditionsAlgorithms/src/SCT_DetectorElementCondAlg.cxx
index 6834a1097f56..0b82033e1378 100644
--- a/InnerDetector/InDetConditions/SCT_ConditionsAlgorithms/src/SCT_DetectorElementCondAlg.cxx
+++ b/InnerDetector/InDetConditions/SCT_ConditionsAlgorithms/src/SCT_DetectorElementCondAlg.cxx
@@ -85,7 +85,7 @@ StatusCode SCT_DetectorElementCondAlg::execute(const EventContext& ctx) const
oldEl->getCommonItems(),
readCdo);
oldToNewMap[oldEl] = *newEl;
- newEl++;
+ ++newEl;
}
// Set neighbours and other side
@@ -105,7 +105,7 @@ StatusCode SCT_DetectorElementCondAlg::execute(const EventContext& ctx) const
if (layer) {
newEl->surface().associateLayer(*layer);
}
- oldIt++;
+ ++oldIt;
}
// Apply alignment using readCdo passed to SiDetectorElement
diff --git a/InnerDetector/InDetConditions/SCT_ConditionsTools/src/SCT_ByteStreamErrorsTool.cxx b/InnerDetector/InDetConditions/SCT_ConditionsTools/src/SCT_ByteStreamErrorsTool.cxx
index 570b24adff60..66dccbd463e7 100644
--- a/InnerDetector/InDetConditions/SCT_ConditionsTools/src/SCT_ByteStreamErrorsTool.cxx
+++ b/InnerDetector/InDetConditions/SCT_ConditionsTools/src/SCT_ByteStreamErrorsTool.cxx
@@ -432,7 +432,7 @@ std::pair<StatusCode, unsigned int> SCT_ByteStreamErrorsTool::getErrorCodeWithCa
if (it == whereExected.end()) {
ATH_MSG_ERROR("After fillData in abcdErrorChips, cache does not have an infomation about the " << moduleId);
ATH_MSG_ERROR("Likely cause is a request for for different region");
- std::make_pair(StatusCode::FAILURE, 0);
+ return std::make_pair(StatusCode::FAILURE, 0);
}
return std::make_pair(StatusCode::SUCCESS, it->second);
}
--
GitLab