From f458784284bd282ca8e30e3bbaac3c348f72b78c Mon Sep 17 00:00:00 2001 From: scott snyder <sss@karma> Date: Mon, 22 Jun 2020 16:57:36 +0200 Subject: [PATCH 1/3] LumiBlockData: Fix cppcheck warning. Use preincrement instead of postincrement. --- LumiBlock/LumiBlockData/src/LumiBlockCollection.cxx | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/LumiBlock/LumiBlockData/src/LumiBlockCollection.cxx b/LumiBlock/LumiBlockData/src/LumiBlockCollection.cxx index 79fe1ed222f7..3070dc5414d1 100755 --- a/LumiBlock/LumiBlockData/src/LumiBlockCollection.cxx +++ b/LumiBlock/LumiBlockData/src/LumiBlockCollection.cxx @@ -1,5 +1,5 @@ /* - Copyright (C) 2002-2017 CERN for the benefit of the ATLAS collaboration + Copyright (C) 2002-2020 CERN for the benefit of the ATLAS collaboration */ /////////////////////////////////////////////////////////////////// @@ -51,7 +51,7 @@ LumiBlockCollection& LumiBlockCollection::operator=( const LumiBlockCollection& << " has the following (run,lumiblock) ranges: " << std::endl; LumiBlockCollection::const_iterator it; - for(it=begin(); it!=end(); it++) { + for(it=begin(); it!=end(); ++it) { out << "\t [ (" << (*it)->start().run() << "," << (*it)->start().event() << "):(" -- GitLab From 4cb9234ce3851ac9611afcd98a23a6c5de514f57 Mon Sep 17 00:00:00 2001 From: scott snyder <sss@karma> Date: Mon, 22 Jun 2020 16:57:57 +0200 Subject: [PATCH 2/3] LArRawConditions: Fix cppcheck warning. Use preincrement instead of postincrement for iterators. --- .../LArRawConditions/LArConditionsContainer.icc | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/LArCalorimeter/LArRawConditions/LArRawConditions/LArConditionsContainer.icc b/LArCalorimeter/LArRawConditions/LArRawConditions/LArConditionsContainer.icc index c66cf5af661d..f8a9980197b4 100755 --- a/LArCalorimeter/LArRawConditions/LArRawConditions/LArConditionsContainer.icc +++ b/LArCalorimeter/LArRawConditions/LArRawConditions/LArConditionsContainer.icc @@ -1,7 +1,7 @@ //Dear emacs, this is -*- c++ -*- /* - Copyright (C) 2002-2019 CERN for the benefit of the ATLAS collaboration + Copyright (C) 2002-2020 CERN for the benefit of the ATLAS collaboration */ /** @@ -796,7 +796,7 @@ LArConditionsContainer<T>::completeCorrectionChannels() { INSERTMAP::const_iterator it1=idsToInsert.begin(); INSERTMAP::const_iterator it1_e=idsToInsert.end(); - for (;it1!=it1_e;it1++) { + for (;it1!=it1_e;++it1) { const unsigned gain=it1->second.second; const int coolChannel=it1->first; result.push_back(coolChannel); -- GitLab From 4b656ffd670babe7ff5e545212c5dfa8341fe76b Mon Sep 17 00:00:00 2001 From: scott snyder <sss@karma> Date: Mon, 22 Jun 2020 16:58:28 +0200 Subject: [PATCH 3/3] TileEvent: Fix cppcheck warnings. Use preincrement rather than postincrement for user iterators. --- TileCalorimeter/TileEvent/src/TileDQstatus.cxx | 6 ++---- 1 file changed, 2 insertions(+), 4 deletions(-) diff --git a/TileCalorimeter/TileEvent/src/TileDQstatus.cxx b/TileCalorimeter/TileEvent/src/TileDQstatus.cxx index 8c1e148f7187..462c53639ab4 100644 --- a/TileCalorimeter/TileEvent/src/TileDQstatus.cxx +++ b/TileCalorimeter/TileEvent/src/TileDQstatus.cxx @@ -1,8 +1,6 @@ /* - Copyright (C) 2002-2019 CERN for the benefit of the ATLAS collaboration + Copyright (C) 2002-2020 CERN for the benefit of the ATLAS collaboration */ -/* - */ /** * @file TileEvent/src/TileDQstatus.cxx * @author scott snyder <snyder@bnl.gov> @@ -265,7 +263,7 @@ void TileDQstatus::fillBCIDErrDetail(const TileDigitsContainer* digitsCnt, TileDigitsContainer::const_iterator collItr = digitsCnt->begin(); TileDigitsContainer::const_iterator lastColl = digitsCnt->end(); - for (; collItr != lastColl; collItr++) { // Loop over TileModules + for (; collItr != lastColl; ++collItr) { // Loop over TileModules if ((*collItr)->identify() != frag) continue; -- GitLab