Skip to content
Snippets Groups Projects
Commit 025d2b3a authored by Charles Leggett's avatar Charles Leggett Committed by Graeme Stewart
Browse files

endreq -> endmsg, messageService -> msgSvc (AthenaPoolTestAthenaPool-00-00-28)

	* endreq -> endmsg
	* messageService() -> msgSvc()
	* tag AthenaPoolTestAthenaPool-00-00-28

M       src/PixelRDOElemLinkVecCnv.cxx
M       src/PixelRDOElemLinkVecCnv_p1.cxx


Former-commit-id: 982b36a5
parent 9876f3ee
No related branches found
No related tags found
No related merge requests found
...@@ -15,21 +15,21 @@ PixelRDOElemLinkVecCnv::PixelRDOElemLinkVecCnv(ISvcLocator* svcLoc) : ...@@ -15,21 +15,21 @@ PixelRDOElemLinkVecCnv::PixelRDOElemLinkVecCnv(ISvcLocator* svcLoc) :
PixelRDOElemLinkVecPERS* PixelRDOElemLinkVecCnv::createPersistent(PixelRDOElemLinkVec* trans) { PixelRDOElemLinkVecPERS* PixelRDOElemLinkVecCnv::createPersistent(PixelRDOElemLinkVec* trans) {
MsgStream log(messageService(), "PixelRDOElemLinkVecCnv"); MsgStream log(msgSvc(), "PixelRDOElemLinkVecCnv");
log << MSG::DEBUG << "Writing PixelRDOElemLinkVec_p1" << endreq; log << MSG::DEBUG << "Writing PixelRDOElemLinkVec_p1" << endmsg;
PixelRDOElemLinkVecPERS* pers=new PixelRDOElemLinkVecPERS(); PixelRDOElemLinkVecPERS* pers=new PixelRDOElemLinkVecPERS();
m_converter_p1.transToPers(trans,pers,log); m_converter_p1.transToPers(trans,pers,log);
return pers; return pers;
} }
PixelRDOElemLinkVec* PixelRDOElemLinkVecCnv::createTransient() { PixelRDOElemLinkVec* PixelRDOElemLinkVecCnv::createTransient() {
MsgStream log(messageService(), "PixelRDOElemLinkVecCnv" ); MsgStream log(msgSvc(), "PixelRDOElemLinkVecCnv" );
// Search for persistent version to convert - last version first // Search for persistent version to convert - last version first
PixelRDOElemLinkVec* trans = 0; PixelRDOElemLinkVec* trans = 0;
if (compareClassGuid(m_guid1)) { if (compareClassGuid(m_guid1)) {
trans=new PixelRDOElemLinkVec; trans=new PixelRDOElemLinkVec;
log << MSG::DEBUG << "Read PixelRDOElemLinkVec_p1. GUID=" log << MSG::DEBUG << "Read PixelRDOElemLinkVec_p1. GUID="
<< m_classID.toString() << endreq; << m_classID.toString() << endmsg;
PixelRDOElemLinkVec_p1* pers=poolReadObject<PixelRDOElemLinkVec_p1>(); PixelRDOElemLinkVec_p1* pers=poolReadObject<PixelRDOElemLinkVec_p1>();
m_converter_p1.persToTrans(pers,trans,log); m_converter_p1.persToTrans(pers,trans,log);
delete pers; delete pers;
...@@ -37,7 +37,7 @@ PixelRDOElemLinkVec* PixelRDOElemLinkVecCnv::createTransient() { ...@@ -37,7 +37,7 @@ PixelRDOElemLinkVec* PixelRDOElemLinkVecCnv::createTransient() {
} }
else { else {
log << MSG::ERROR << "Unsupported persistent version of PixelRDOElemLinkVec GUID=" log << MSG::ERROR << "Unsupported persistent version of PixelRDOElemLinkVec GUID="
<< m_classID.toString() << endreq; << m_classID.toString() << endmsg;
throw std::runtime_error("Unsupported persistent version of PixelRDOElemLinkVec"); throw std::runtime_error("Unsupported persistent version of PixelRDOElemLinkVec");
} }
return trans; return trans;
......
...@@ -18,7 +18,7 @@ void PixelRDOElemLinkVecCnv_p1::persToTrans(const PixelRDOElemLinkVec_p1* pers, ...@@ -18,7 +18,7 @@ void PixelRDOElemLinkVecCnv_p1::persToTrans(const PixelRDOElemLinkVec_p1* pers,
// log << MSG::ERROR // log << MSG::ERROR
// << "persToTrans: index " << pers->m_pixelRDOs[i].m_contIndex << " " // << "persToTrans: index " << pers->m_pixelRDOs[i].m_contIndex << " "
// << pers->m_pixelRDOs[i].m_elementIndex // << pers->m_pixelRDOs[i].m_elementIndex
// << endreq; // << endmsg;
m_elementLinkCnv.persToTrans(&pers->m_pixelRDOs[i], &trans->pixelRDOs()[i], log); m_elementLinkCnv.persToTrans(&pers->m_pixelRDOs[i], &trans->pixelRDOs()[i], log);
} }
} }
...@@ -36,7 +36,7 @@ void PixelRDOElemLinkVecCnv_p1::transToPers(const PixelRDOElemLinkVec* trans, ...@@ -36,7 +36,7 @@ void PixelRDOElemLinkVecCnv_p1::transToPers(const PixelRDOElemLinkVec* trans,
// log << MSG::ERROR // log << MSG::ERROR
// << "transToPers: index " << MSG::hex // << "transToPers: index " << MSG::hex
// << trans->m_pixelRDOs[i].index() << " " << MSG::dec // << trans->m_pixelRDOs[i].index() << " " << MSG::dec
// << endreq; // << endmsg;
m_elementLinkCnv.transToPers( &trans->pixelRDOs()[i], &pers->m_pixelRDOs[i], log); m_elementLinkCnv.transToPers( &trans->pixelRDOs()[i], &pers->m_pixelRDOs[i], log);
} }
} }
......
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