Skip to content
Snippets Groups Projects
Commit 34e3b0fc authored by Walter Lampl's avatar Walter Lampl
Browse files

Merge branch 'clang10.EventInfo-20200708' into 'master'

EventInfo+xAODTau+TrigConfIO+MuonEventTPCnv: Fix clang 10 warnings.

See merge request atlas/athena!34563
parents 20b1ed92 d9634879
No related branches found
No related tags found
6 merge requests!58791DataQualityConfigurations: Modify L1Calo config for web display,!46784MuonCondInterface: Enable thread-safety checking.,!46776Updated LArMonitoring config file for WD to match new files produced using MT,!45405updated ART test cron job,!42417Draft: DIRE and VINCIA Base Fragments for Pythia 8.3,!34563EventInfo+xAODTau+TrigConfIO+MuonEventTPCnv: Fix clang 10 warnings.
/* /*
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 EventStreamInfo.cxx /** @file EventStreamInfo.cxx
...@@ -99,7 +99,7 @@ EventStreamInfo::print(MsgStream& log) const { ...@@ -99,7 +99,7 @@ EventStreamInfo::print(MsgStream& log) const {
} }
log << MSG::DEBUG << endmsg; log << MSG::DEBUG << endmsg;
log << MSG::DEBUG << "EventStreamInfo Processing Tags: "; log << MSG::DEBUG << "EventStreamInfo Processing Tags: ";
for (const std::string tag : m_processingTags) { for (const std::string& tag : m_processingTags) {
log << MSG::DEBUG << tag << ", "; log << MSG::DEBUG << tag << ", ";
} }
log << MSG::DEBUG << endmsg; log << MSG::DEBUG << endmsg;
......
...@@ -537,7 +537,7 @@ namespace xAOD { ...@@ -537,7 +537,7 @@ namespace xAOD {
/// Get the v<const pointer> to a given tauTrack collection associated with this tau /// Get the v<const pointer> to a given tauTrack collection associated with this tau
std::vector<const TauTrack*> TauJet_v3::tracksWithMask(unsigned int mask )const { std::vector<const TauTrack*> TauJet_v3::tracksWithMask(unsigned int mask )const {
std::vector<const TauTrack*> trks; std::vector<const TauTrack*> trks;
for(const ElementLink< xAOD::TauTrackContainer > link : tauTrackAcc(*this) ){ for(const ElementLink< xAOD::TauTrackContainer >& link : tauTrackAcc(*this) ){
const TauTrack* trk = *link; const TauTrack* trk = *link;
if(trk->flagWithMask(mask)){ if(trk->flagWithMask(mask)){
trks.push_back(trk); trks.push_back(trk);
......
/* /*
Copyright (C) 2002-2017 CERN for the benefit of the ATLAS collaboration Copyright (C) 2002-2020 CERN for the benefit of the ATLAS collaboration
*/ */
#include "MuonEventTPCnv/MuonRDO/MM_RawDataContainerCnv_p1.h" #include "MuonEventTPCnv/MuonRDO/MM_RawDataContainerCnv_p1.h"
...@@ -40,7 +40,7 @@ void Muon::MM_RawDataContainerCnv_p1::persToTrans(const Muon::MM_RawDataContain ...@@ -40,7 +40,7 @@ void Muon::MM_RawDataContainerCnv_p1::persToTrans(const Muon::MM_RawDataContain
if (DEBUG) log<<MSG::VERBOSE<<"MM_RawDataContainerCnv_p1::persToTrans with MM_RawDataContainer_p1 with this many collections "<<numColl<<std::endl; if (DEBUG) log<<MSG::VERBOSE<<"MM_RawDataContainerCnv_p1::persToTrans with MM_RawDataContainer_p1 with this many collections "<<numColl<<std::endl;
MM_RawDataCollection* coll = nullptr; MM_RawDataCollection* coll = nullptr;
for ( const MM_RawDataCollection_p1 collection : *persCont){ for ( const MM_RawDataCollection_p1& collection : *persCont){
coll = new MM_RawDataCollection(collection.m_idHash); coll = new MM_RawDataCollection(collection.m_idHash);
if ( transCont->addCollection(coll,collection.m_idHash).isFailure() ) { if ( transCont->addCollection(coll,collection.m_idHash).isFailure() ) {
......
/* /*
Copyright (C) 2002-2017 CERN for the benefit of the ATLAS collaboration Copyright (C) 2002-2020 CERN for the benefit of the ATLAS collaboration
*/ */
#include "MuonEventTPCnv/MuonRDO/STGC_RawDataContainerCnv_p1.h" #include "MuonEventTPCnv/MuonRDO/STGC_RawDataContainerCnv_p1.h"
...@@ -39,7 +39,7 @@ void Muon::STGC_RawDataContainerCnv_p1::persToTrans(const Muon::STGC_RawDataCon ...@@ -39,7 +39,7 @@ void Muon::STGC_RawDataContainerCnv_p1::persToTrans(const Muon::STGC_RawDataCon
if (DEBUG) log<<MSG::VERBOSE<<"STGC_RawDataContainerCnv_p1::persToTrans with STGC_RawDataContainer_p1 with this many collections "<<numColl<<std::endl; if (DEBUG) log<<MSG::VERBOSE<<"STGC_RawDataContainerCnv_p1::persToTrans with STGC_RawDataContainer_p1 with this many collections "<<numColl<<std::endl;
STGC_RawDataCollection* coll = nullptr; STGC_RawDataCollection* coll = nullptr;
for ( const STGC_RawDataCollection_p1 collection : *persCont){ for ( const STGC_RawDataCollection_p1& collection : *persCont){
coll = new STGC_RawDataCollection(collection.m_idHash); coll = new STGC_RawDataCollection(collection.m_idHash);
if ( transCont->addCollection(coll,collection.m_idHash).isFailure() ) { if ( transCont->addCollection(coll,collection.m_idHash).isFailure() ) {
log << MSG::WARNING << "Could not add the sTGC collection during persistent->transient conversion" << std::endl; log << MSG::WARNING << "Could not add the sTGC collection during persistent->transient conversion" << std::endl;
......
/* /*
Copyright (C) 2002-2019 CERN for the benefit of the ATLAS collaboration Copyright (C) 2002-2020 CERN for the benefit of the ATLAS collaboration
*/ */
#include <cstdlib> #include <cstdlib>
...@@ -245,9 +245,9 @@ int main(int argc, char** argv) { ...@@ -245,9 +245,9 @@ int main(int argc, char** argv) {
fileLoader.loadFile( fn, jo); fileLoader.loadFile( fn, jo);
cout << "Loaded job options with " << jo.getObject("properties").getKeys().size() << " entries " << endl; cout << "Loaded job options with " << jo.getObject("properties").getKeys().size() << " entries " << endl;
if( cfg.detail ) { if( cfg.detail ) {
for( const auto alg : jo.getObject("properties").data()) { for( const auto& alg : jo.getObject("properties").data()) {
std::cout << alg.first << std::endl; std::cout << alg.first << std::endl;
for( const auto prop : alg.second ) { for( const auto& prop : alg.second ) {
std::cout << " " << prop.first << " -> " << prop.second.data() << std::endl; std::cout << " " << prop.first << " -> " << prop.second.data() << std::endl;
} }
} }
...@@ -292,9 +292,9 @@ int main(int argc, char** argv) { ...@@ -292,9 +292,9 @@ int main(int argc, char** argv) {
if (jo) { if (jo) {
cout << "Loaded job options with " << jo.getObject("properties").getKeys().size() << " entries " << endl; cout << "Loaded job options with " << jo.getObject("properties").getKeys().size() << " entries " << endl;
if( cfg.detail ) { if( cfg.detail ) {
for( const auto alg : jo.getObject("properties").data()) { for( const auto& alg : jo.getObject("properties").data()) {
std::cout << alg.first << std::endl; std::cout << alg.first << std::endl;
for( const auto prop : alg.second ) { for( const auto& prop : alg.second ) {
std::cout << " " << prop.first << " -> " << prop.second.data() << std::endl; std::cout << " " << prop.first << " -> " << prop.second.data() << std::endl;
} }
} }
......
0% Loading or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment