From 0489841ed4130dc94dbfc6981a2c9b8326327f9a Mon Sep 17 00:00:00 2001
From: ckato <ckato@cern.ch>
Date: Sun, 18 Nov 2018 21:39:23 +0100
Subject: [PATCH] my readCdo check if nullptr rather than 0
---
.../MuonAlignErrorTool/src/AlignmentErrorTool.cxx | 2 +-
.../MuonCablings/MuonMDT_Cabling/src/MuonMDT_CablingAlg.cxx | 4 ++--
.../MuonCnv/MuonMDT_CnvTools/src/MdtRDO_Decoder.h | 4 ++--
.../MuonCnv/MuonMDT_CnvTools/src/MdtRdoToPrepDataTool.cxx | 2 +-
.../MuonCondSvc/src/MuonAlignmentErrorDbAlg.cxx | 2 +-
5 files changed, 7 insertions(+), 7 deletions(-)
diff --git a/MuonSpectrometer/MuonAlignment/MuonAlignError/MuonAlignErrorTool/src/AlignmentErrorTool.cxx b/MuonSpectrometer/MuonAlignment/MuonAlignError/MuonAlignErrorTool/src/AlignmentErrorTool.cxx
index 344de640956..851b0c882a2 100644
--- a/MuonSpectrometer/MuonAlignment/MuonAlignError/MuonAlignErrorTool/src/AlignmentErrorTool.cxx
+++ b/MuonSpectrometer/MuonAlignment/MuonAlignError/MuonAlignErrorTool/src/AlignmentErrorTool.cxx
@@ -79,7 +79,7 @@ void AlignmentErrorTool::makeAlignmentDeviations (const Trk::Track& track, std::
SG::ReadCondHandle<MuonAlignmentErrorData> readHandle{m_readKey};
const MuonAlignmentErrorData* readCdo{*readHandle};
- if(readCdo==0){
+ if(readCdo==nullptr){
ATH_MSG_ERROR("Null pointer to the read conditions object");
std::cout<<"ckato Null pointer to the read conditions object"<<std::endl;
return;
diff --git a/MuonSpectrometer/MuonCablings/MuonMDT_Cabling/src/MuonMDT_CablingAlg.cxx b/MuonSpectrometer/MuonCablings/MuonMDT_Cabling/src/MuonMDT_CablingAlg.cxx
index 110c4f7e80e..4bc4baf9de8 100644
--- a/MuonSpectrometer/MuonCablings/MuonMDT_Cabling/src/MuonMDT_CablingAlg.cxx
+++ b/MuonSpectrometer/MuonCablings/MuonMDT_Cabling/src/MuonMDT_CablingAlg.cxx
@@ -66,7 +66,7 @@ StatusCode MuonMDT_CablingAlg::execute(){
SG::ReadCondHandle<CondAttrListCollection> readHandleMez{ m_readKeyMez };
const CondAttrListCollection* readCdoMez{*readHandleMez};
- if(readCdoMez==0){
+ if(readCdoMez==nullptr){
ATH_MSG_ERROR("Null pointer to the read conditions object");
return StatusCode::FAILURE;
}
@@ -80,7 +80,7 @@ StatusCode MuonMDT_CablingAlg::execute(){
SG::ReadCondHandle<CondAttrListCollection> readHandleMap{ m_readKeyMap };
const CondAttrListCollection* readCdoMap{*readHandleMap};
- if(readCdoMap==0){
+ if(readCdoMap==nullptr){
ATH_MSG_ERROR("Null pointer to the read conditions object");
return StatusCode::FAILURE;
}
diff --git a/MuonSpectrometer/MuonCnv/MuonMDT_CnvTools/src/MdtRDO_Decoder.h b/MuonSpectrometer/MuonCnv/MuonMDT_CnvTools/src/MdtRDO_Decoder.h
index 71956744cbf..8c5c85053be 100755
--- a/MuonSpectrometer/MuonCnv/MuonMDT_CnvTools/src/MdtRDO_Decoder.h
+++ b/MuonSpectrometer/MuonCnv/MuonMDT_CnvTools/src/MdtRDO_Decoder.h
@@ -67,7 +67,7 @@ inline MdtDigit* Muon::MdtRDO_Decoder::getDigit(const MdtAmtHit* amtHit, uint16_
SG::ReadCondHandle<MuonMDT_CablingMap> readHandle{m_readKey};
const MuonMDT_CablingMap* readCdo{*readHandle};
- if(readCdo==0){
+ if(readCdo==nullptr){
ATH_MSG_ERROR("Null pointer to the read conditions object");
return NULL;
}
@@ -110,7 +110,7 @@ inline Identifier Muon::MdtRDO_Decoder::getOfflineData(const MdtAmtHit* amtHit,
Identifier chanIdDefault;
SG::ReadCondHandle<MuonMDT_CablingMap> readHandle{m_readKey};
const MuonMDT_CablingMap* readCdo{*readHandle};
- if(readCdo==0){
+ if(readCdo==nullptr){
ATH_MSG_ERROR("Null pointer to the read conditions object");
return chanIdDefault;
}
diff --git a/MuonSpectrometer/MuonCnv/MuonMDT_CnvTools/src/MdtRdoToPrepDataTool.cxx b/MuonSpectrometer/MuonCnv/MuonMDT_CnvTools/src/MdtRdoToPrepDataTool.cxx
index 695bafcc870..08e0993f433 100644
--- a/MuonSpectrometer/MuonCnv/MuonMDT_CnvTools/src/MdtRdoToPrepDataTool.cxx
+++ b/MuonSpectrometer/MuonCnv/MuonMDT_CnvTools/src/MdtRdoToPrepDataTool.cxx
@@ -164,7 +164,7 @@ StatusCode Muon::MdtRdoToPrepDataTool::decode( const std::vector<uint32_t>& robI
{
SG::ReadCondHandle<MuonMDT_CablingMap> readHandle{m_readKey};
const MuonMDT_CablingMap* readCdo{*readHandle};
- if(readCdo==0){
+ if(readCdo==nullptr){
ATH_MSG_ERROR("Null pointer to the read conditions object");
return StatusCode::FAILURE;
}
diff --git a/MuonSpectrometer/MuonConditions/MuonCondGeneral/MuonCondSvc/src/MuonAlignmentErrorDbAlg.cxx b/MuonSpectrometer/MuonConditions/MuonCondGeneral/MuonCondSvc/src/MuonAlignmentErrorDbAlg.cxx
index 4c76add8d4e..cad8d2fe9e7 100644
--- a/MuonSpectrometer/MuonConditions/MuonCondGeneral/MuonCondSvc/src/MuonAlignmentErrorDbAlg.cxx
+++ b/MuonSpectrometer/MuonConditions/MuonCondGeneral/MuonCondSvc/src/MuonAlignmentErrorDbAlg.cxx
@@ -45,7 +45,7 @@ StatusCode MuonAlignmentErrorDbAlg::execute(){
const CondAttrListCollection* readCdo{*readHandle};
//const CondAttrListCollection* atrc(0);
//readCdo = *readHandle;
- if(readCdo==0){
+ if(readCdo==nullptr){
ATH_MSG_ERROR("Null pointer to the read conditions object");
return StatusCode::FAILURE;
}
--
GitLab