Merge branch '22.0-cppcheck-SCT_ConditionsAlgorithms' into 'master'

22.0-cppcheck-SCT_ConditionsAlgorithms

See merge request atlas/athena!45312

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

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);
 }