diff --git a/Calorimeter/CaloEvent/test/CaloTowerContainer_test.cxx b/Calorimeter/CaloEvent/test/CaloTowerContainer_test.cxx index 2531baa18dfac6dba8c323fa7192f7409d34e530..2aca4457ed8b0633bf07612c8aec9f71580d18bc 100644 --- a/Calorimeter/CaloEvent/test/CaloTowerContainer_test.cxx +++ b/Calorimeter/CaloEvent/test/CaloTowerContainer_test.cxx @@ -1,5 +1,5 @@ /* - Copyright (C) 2002-2017 CERN for the benefit of the ATLAS collaboration + Copyright (C) 2002-2019 CERN for the benefit of the ATLAS collaboration */ // $Id$ @@ -15,7 +15,6 @@ #include "CaloEvent/CaloTowerContainer.h" #include "TestTools/expect_exception.h" #include "TestTools/FLOATassert.h" -#include "boost/foreach.hpp" #include <iostream> #include <cstdarg> @@ -260,8 +259,9 @@ void test3_check (T& p) assert ((*p.rbegin())->energy() == 100); double sum = 0; - BOOST_FOREACH (const CaloTower* i, p) + for (const CaloTower* i : p) { sum += i->energy(); + } assert (sum == 3025); CaloTowerContainer::const_iterator cit = p.begin(); diff --git a/Calorimeter/CaloUtils/src/CaloTowerBuilderToolTestAlg.cxx b/Calorimeter/CaloUtils/src/CaloTowerBuilderToolTestAlg.cxx index f69f163e54b0c88124e901ec602ce0aaba409936..2f1a1a5597c15c08b0bfba459c7750cb3e89f4f1 100644 --- a/Calorimeter/CaloUtils/src/CaloTowerBuilderToolTestAlg.cxx +++ b/Calorimeter/CaloUtils/src/CaloTowerBuilderToolTestAlg.cxx @@ -19,7 +19,6 @@ #include "CaloDetDescr/CaloDetDescrManager.h" #include "AthenaKernel/errorcheck.h" #include "CLHEP/Units/SystemOfUnits.h" -#include "boost/foreach.hpp" #include <cstdlib> #include <iostream> #include <cmath> @@ -108,9 +107,9 @@ CaloTowerBuilderToolTestAlg::make_cells() const CaloDetDescrManager* ddman = 0; if ( detStore()->retrieve (ddman, "CaloMgr").isFailure() ) std::abort(); - BOOST_FOREACH (CaloCell_ID::SUBCALO subcalo, m_calos) { - BOOST_FOREACH (const CaloDetDescrElement* dde, - ddman->element_range (subcalo)) + for (CaloCell_ID::SUBCALO subcalo : m_calos) { + for (const CaloDetDescrElement* dde : + ddman->element_range (subcalo)) { float energy = randf (100*GeV); cells->push_back (new CaloCell (dde, energy, 0, 0, 0, diff --git a/Control/StoreGate/src/SGImplSvc.cxx b/Control/StoreGate/src/SGImplSvc.cxx index 8d6221496dcb19660c8f53bf11c537a076b82e96..71d145e6583092f56f0d511a12bfc297b08e6809 100644 --- a/Control/StoreGate/src/SGImplSvc.cxx +++ b/Control/StoreGate/src/SGImplSvc.cxx @@ -47,7 +47,6 @@ // StoreGateSvc. must come before SGImplSvc.h #include "StoreGate/StoreGateSvc.h" #include "StoreGate/tools/SGImplSvc.h" -#include "boost/foreach.hpp" using std::ostringstream; using std::setw; @@ -1774,7 +1773,7 @@ void SGImplSvc::addAutoSymLinks (const std::string& key, // Handle copy conversions. { - BOOST_FOREACH(CLID copy_clid, bib->get_copy_conversions()) { + for (CLID copy_clid : bib->get_copy_conversions()) { if (m_pStore->addSymLink (copy_clid, dp).isFailure()) { warning() << "record_impl: Doing auto-symlinks for object with CLID " << clid