diff --git a/Control/DataModelAthenaPool/CMakeLists.txt b/Control/DataModelAthenaPool/CMakeLists.txt
index 4264959a7ec48c7c2ed7185c3497e171f0e5bb25..2dc72e4dbf04207eef76da4925c3f80ac3b8bd3c 100644
--- a/Control/DataModelAthenaPool/CMakeLists.txt
+++ b/Control/DataModelAthenaPool/CMakeLists.txt
@@ -13,12 +13,12 @@ atlas_depends_on_subdirs( PUBLIC
Control/AthenaKernel
Control/Navigation
Control/RootUtils
+ Database/AthenaPOOL/AthenaPoolCnvSvc
GaudiKernel
PRIVATE
AtlasTest/TestTools
Control/CLIDSvc
Control/SGTools
- Database/AthenaPOOL/AthenaPoolCnvSvc
Database/AthenaPOOL/AthenaPoolUtilities
Database/AthenaPOOL/RootConversions )
diff --git a/Control/DataModelAthenaPool/DataModelAthenaPool/AthenaBarCodeCnv_p1.h b/Control/DataModelAthenaPool/DataModelAthenaPool/AthenaBarCodeCnv_p1.h
index 30f2cf3f832a1fc0fd731b08eab96c9c623649f9..c5c0654f8f131d377abd3d1b77974d9923944347 100755
--- a/Control/DataModelAthenaPool/DataModelAthenaPool/AthenaBarCodeCnv_p1.h
+++ b/Control/DataModelAthenaPool/DataModelAthenaPool/AthenaBarCodeCnv_p1.h
@@ -53,13 +53,13 @@ inline void AthenaBarCodeCnv_p1::persToTrans(const AthenaBarCode_p1* pers,
trans->setAthenaBarCode(IAthenaBarCode::UNDEFINEDBARCODE);
//Maybe reading from an old version where Athenabarcode didn't exist
if (msgCount<ABCMAXMSGCOUNT) {
- // log << MSG::DEBUG << "AthenaBarCodeCnv_p1::persToTrans(): AthenaBarCode undefined in the persistent state. Maybe reading from an older version where AthenaBarCode didn't exist. A new AthenaBarCode has been assigned to this object: " <<std::hex<<trans->getAthenaBarCode()<<endreq;
+ // log << MSG::DEBUG << "AthenaBarCodeCnv_p1::persToTrans(): AthenaBarCode undefined in the persistent state. Maybe reading from an older version where AthenaBarCode didn't exist. A new AthenaBarCode has been assigned to this object: " <<std::hex<<trans->getAthenaBarCode()<<endmsg;
++msgCount;
} else if (msgCount==ABCMAXMSGCOUNT) {
- // log << MSG::DEBUG << "AthenaBarCodeCnv_p1::persToTrans(): AthenaBarCode undefined in the persistent state. Maybe reading from an older version where AthenaBarCode didn't exist. A new AthenaBarCode has been assigned to this object: " <<std::hex<<trans->getAthenaBarCode()<<"suppressing further messages on this issue, please set message level to VERBOSE to see other messages."<<endreq;
+ // log << MSG::DEBUG << "AthenaBarCodeCnv_p1::persToTrans(): AthenaBarCode undefined in the persistent state. Maybe reading from an older version where AthenaBarCode didn't exist. A new AthenaBarCode has been assigned to this object: " <<std::hex<<trans->getAthenaBarCode()<<"suppressing further messages on this issue, please set message level to VERBOSE to see other messages."<<endmsg;
++msgCount;
} else {
- // log << MSG::VERBOSE << "AthenaBarCodeCnv_p1::persToTrans(): AthenaBarCode undefined in the persistent state. Maybe reading from an older version where AthenaBarCode didn't exist. A new AthenaBarCode has been assigned to this object: " <<std::hex<<trans->getAthenaBarCode()<<endreq;
+ // log << MSG::VERBOSE << "AthenaBarCodeCnv_p1::persToTrans(): AthenaBarCode undefined in the persistent state. Maybe reading from an older version where AthenaBarCode didn't exist. A new AthenaBarCode has been assigned to this object: " <<std::hex<<trans->getAthenaBarCode()<<endmsg;
}
} else {
trans->setAthenaBarCode(pers->m_athenabarcode);
@@ -67,12 +67,12 @@ inline void AthenaBarCodeCnv_p1::persToTrans(const AthenaBarCode_p1* pers,
// log << MSG::WARNING
// << "AthenaBarCodeCnv_p1::persToTrans(): BarCode for Object "
// <<trans->getAthenaBarCode()
- // <<" has no jobID hash, something wrong!"<<endreq;
+ // <<" has no jobID hash, something wrong!"<<endmsg;
}
}
// log<<MSG::VERBOSE<<"AthenaBarCodeCnv_p1::persToTrans::trans->getAthenaBarCode()="
- //<<std::hex<<trans->getAthenaBarCode()<<endreq;
+ //<<std::hex<<trans->getAthenaBarCode()<<endmsg;
}
#endif
diff --git a/Control/DataModelAthenaPool/DataModelAthenaPool/ElementLinkCnv_p1.icc b/Control/DataModelAthenaPool/DataModelAthenaPool/ElementLinkCnv_p1.icc
index 8788f36b3124adca604a82df83a43d3b44a2b880..0241bb404b82bebbb82043bd3c9d902161c64f64 100755
--- a/Control/DataModelAthenaPool/DataModelAthenaPool/ElementLinkCnv_p1.icc
+++ b/Control/DataModelAthenaPool/DataModelAthenaPool/ElementLinkCnv_p1.icc
@@ -56,10 +56,10 @@ transToPers(const Link_t* trans, PersLink_t* pers, MsgStream&
#ifdef ELLINK_DEBUG
msg << MSG::DEBUG << "caught a maybe_thinning_error: ["
<< err.what() << "]"
- << endreq
+ << endmsg
<< "(this is an expected case of the EL-state-phase-space "
<< "when thinning is active)"
- << endreq;
+ << endmsg;
#endif
}
const std::size_t persIdx = dp ?
@@ -82,7 +82,7 @@ transToPers(const Link_t* trans, PersLink_t* pers, MsgStream&
#ifdef ELLINK_DEBUG
msg << MSG::INFO << "ElementLinkCnv_p1::transToPer(): SG Container="
<< pers->m_contName << ", Key Hash=" << pers->m_SGKeyHash
- << ", IDX=" << pers->m_elementIndex << endreq;
+ << ", IDX=" << pers->m_elementIndex << endmsg;
#endif
}
}
@@ -99,20 +99,20 @@ void ElementLinkCnv_p1< LINK_TYPE >
if( !pers->m_contName.empty() ) {
#ifdef ELLINK_DEBUG
msg << MSG::DEBUG << "ElementLinkCnv_p1::PersToTrans(): SGContainer="
- << pers->m_contName << ", IDX=" << pers->m_elementIndex << endreq;
+ << pers->m_contName << ", IDX=" << pers->m_elementIndex << endmsg;
#endif
*trans = Link_t(pers->m_contName, pers->m_elementIndex);
}
else if( pers->m_SGKeyHash != 0 ) {
#ifdef ELLINK_DEBUG
msg << MSG::DEBUG << "ElementLinkCnv_p1::PersToTrans(): SGContainer hash="
- << pers->m_SGKeyHash << ", IDX=" << pers->m_elementIndex << endreq;
+ << pers->m_SGKeyHash << ", IDX=" << pers->m_elementIndex << endmsg;
#endif
*trans = Link_t( (typename Link_t::sgkey_t)pers->m_SGKeyHash, pers->m_elementIndex);
}
else {
#ifdef ELLINK_DEBUG
- msg << MSG::DEBUG << "ElementLinkCnv_p1::PersToTrans(): reading EL in Default state" << endreq;
+ msg << MSG::DEBUG << "ElementLinkCnv_p1::PersToTrans(): reading EL in Default state" << endmsg;
#endif
// set the transient ELink to the default state.
trans->reset();
diff --git a/Control/DataModelAthenaPool/DataModelAthenaPool/ElementLinkCnv_p2.icc b/Control/DataModelAthenaPool/DataModelAthenaPool/ElementLinkCnv_p2.icc
index e8de03f360eabb11fd81ddfd765c010fe3656800..46a638804a16bda24abacaec0d1687dec6b85d55 100755
--- a/Control/DataModelAthenaPool/DataModelAthenaPool/ElementLinkCnv_p2.icc
+++ b/Control/DataModelAthenaPool/DataModelAthenaPool/ElementLinkCnv_p2.icc
@@ -122,10 +122,10 @@ transToPers(const Link_t* trans, PersLink_t* pers, MsgStream&
#ifdef ELLINK_DEBUG
msg << MSG::DEBUG << "caught a maybe_thinning_error: ["
<< err.what() << "]"
- << endreq
+ << endmsg
<< "(this is an expected case of the EL-state-phase-space "
<< "when thinning is active)"
- << endreq;
+ << endmsg;
#endif
}
const std::size_t persIdx = dp ?
@@ -145,7 +145,7 @@ transToPers(const Link_t* trans, PersLink_t* pers, MsgStream&
#ifdef ELLINK_DEBUG
msg << MSG::ERROR
<< "Empty link name table ptr - must use resetForCnv "
- << endreq;
+ << endmsg;
#endif
}
else {
@@ -161,7 +161,7 @@ transToPers(const Link_t* trans, PersLink_t* pers, MsgStream&
#ifdef ELLINK_DEBUG
msg << MSG::ERROR
<< "Empty link name table ptr - must use resetForCnv "
- << endreq;
+ << endmsg;
#endif
}
else {
@@ -175,7 +175,7 @@ transToPers(const Link_t* trans, PersLink_t* pers, MsgStream&
<< trans->dataID() << ", IDX= " << trans->index()
<< ", pers cont index= " << pers->m_contIndex
<< ", ele index= " << pers->m_elementIndex
- << endreq;
+ << endmsg;
#endif
}
}
@@ -197,11 +197,11 @@ void ElementLinkCnv_p2< LINK_TYPE >
#ifdef ELLINK_DEBUG
if (contName) {
log << MSG::DEBUG << "ElementLinkCnv_p2::PersToTrans(): container name" <<
- (*contName) << endreq;
+ (*contName) << endmsg;
}
else {
log << MSG::ERROR << "ElementLinkCnv_p2::PersToTrans(): container name EMPTY"
- << endreq;
+ << endmsg;
}
#endif
if( contName->empty() ) {
@@ -210,7 +210,7 @@ void ElementLinkCnv_p2< LINK_TYPE >
// existing EL from DataPool
trans->reset();
#ifdef ELLINK_DEBUG
- log << MSG::DEBUG << "ElementLinkCnv_p2::PersToTrans(): reading EL in Default state" << endreq;
+ log << MSG::DEBUG << "ElementLinkCnv_p2::PersToTrans(): reading EL in Default state" << endmsg;
#endif
} else {
// reset trans ELink with key and index - changeds to identified state
@@ -218,10 +218,10 @@ void ElementLinkCnv_p2< LINK_TYPE >
#ifdef ELLINK_DEBUG
log << MSG::DEBUG << "ElementLinkCnv_p2::PersToTrans(): KEY="
- << (*contName) << ", IDX=" << pers->m_elementIndex << endreq;
+ << (*contName) << ", IDX=" << pers->m_elementIndex << endmsg;
if ((*contName) == "NO LAST NAME") {
log << MSG::ERROR << "ElementLinkCnv_p2::PersToTrans(): INCORRECT KEY KEY="
- << (*contName) << ", IDX=" << pers->m_elementIndex << endreq;
+ << (*contName) << ", IDX=" << pers->m_elementIndex << endmsg;
}
#endif
}
@@ -305,11 +305,11 @@ ElementLinkCnv_p2< LINK_TYPE >::getContName (unsigned int nameIndex,
// Get the container name with the name index from the lookup table
if (!m_clookupTable || m_clookupTable->m_names.size() < nameIndex + 1) {
if (!m_clookupTable) {
- log << MSG::ERROR << "Empty link name table ptr" << endreq;
+ log << MSG::ERROR << "Empty link name table ptr" << endmsg;
}
else {
log << MSG::ERROR << "Empty name vector in lookup table - looking for index "
- << nameIndex << " size " << m_clookupTable->m_names.size() << endreq;
+ << nameIndex << " size " << m_clookupTable->m_names.size() << endmsg;
}
return;
}
diff --git a/Control/DataModelAthenaPool/DataModelAthenaPool/ElementLinkCnv_p3.icc b/Control/DataModelAthenaPool/DataModelAthenaPool/ElementLinkCnv_p3.icc
index 8f3a7c02d6ee4e2736bba614e001a159739c033a..e375f40a7af89448dbf3087bbea241b0faf993cd 100644
--- a/Control/DataModelAthenaPool/DataModelAthenaPool/ElementLinkCnv_p3.icc
+++ b/Control/DataModelAthenaPool/DataModelAthenaPool/ElementLinkCnv_p3.icc
@@ -49,10 +49,10 @@ transToPers(const Link_t* trans, PersLink_t* pers, MsgStream&
#ifdef ELLINK_DEBUG
msg << MSG::DEBUG << "caught a maybe_thinning_error: ["
<< err.what() << "]"
- << endreq
+ << endmsg
<< "(this is an expected case of the EL-state-phase-space "
<< "when thinning is active)"
- << endreq;
+ << endmsg;
#endif
}
const std::size_t persIdx = dp ?
@@ -71,7 +71,7 @@ transToPers(const Link_t* trans, PersLink_t* pers, MsgStream&
#ifdef ELLINK_DEBUG
msg << MSG::INFO << "ElementLinkCnv_p3::transToPer(): SG Container="
<< ", Key Hash=" << pers->m_SGKeyHash
- << ", IDX=" << pers->m_elementIndex << endreq;
+ << ", IDX=" << pers->m_elementIndex << endmsg;
#endif
}
}
@@ -88,13 +88,13 @@ void ElementLinkCnv_p3< LINK_TYPE >
if( pers->m_SGKeyHash != 0 ) {
#ifdef ELLINK_DEBUG
msg << MSG::DEBUG << "ElementLinkCnv_p3::PersToTrans(): SGContainer hash="
- << pers->m_SGKeyHash << ", IDX=" << pers->m_elementIndex << endreq;
+ << pers->m_SGKeyHash << ", IDX=" << pers->m_elementIndex << endmsg;
#endif
*trans = Link_t( (typename Link_t::sgkey_t)pers->m_SGKeyHash, pers->m_elementIndex);
}
else {
#ifdef ELLINK_DEBUG
- msg << MSG::DEBUG << "ElementLinkCnv_p3::PersToTrans(): reading EL in Default state" << endreq;
+ msg << MSG::DEBUG << "ElementLinkCnv_p3::PersToTrans(): reading EL in Default state" << endmsg;
#endif
// set the transient ELink to the default state.
trans->reset();
diff --git a/Control/DataModelAthenaPool/DataModelAthenaPool/ElementLinkVectorCnv_p1.icc b/Control/DataModelAthenaPool/DataModelAthenaPool/ElementLinkVectorCnv_p1.icc
index 175e9ae842a0646d0371b0ce0843f98879e9095b..cf8d36c71baed71fe5949fcf0044e7abf059ca3c 100755
--- a/Control/DataModelAthenaPool/DataModelAthenaPool/ElementLinkVectorCnv_p1.icc
+++ b/Control/DataModelAthenaPool/DataModelAthenaPool/ElementLinkVectorCnv_p1.icc
@@ -79,10 +79,10 @@ void ElementLinkVectorCnv_p1<LINK_TYPE>::transToPers(const LinkVect_t* trans, Pe
// ok. that's the corner case we talked about above.
msg << MSG::DEBUG
<< "caught a maybe_thinning_error: [" << err.what() << "]"
- << endreq
+ << endmsg
<< "(this is an expected case of the EL-state-phase-space "
<< "when thinning is active)"
- << endreq;
+ << endmsg;
}
const SG::DataProxy* dp = el.proxy();
const std::size_t idx = dp ?
@@ -101,7 +101,7 @@ void ElementLinkVectorCnv_p1<LINK_TYPE>::transToPers(const LinkVect_t* trans, Pe
shortref = std::distance (trans->beginHostDObjs(), ihost);
else {
msg << MSG::WARNING
- << "link not found in ElemLinkVector" << endreq;
+ << "link not found in ElemLinkVector" << endmsg;
}
}
typedef typename PersLinkVect_t::ElementRef PersELRef;
@@ -140,7 +140,7 @@ void ElementLinkVectorCnv_p1< LINK_TYPE >::persToTrans(const PersLinkVect_t* per
<< "ElementLinkVectorCnv_p1::PersToTrans(): KEY="
<< pers->m_links[link_iter->m_nameIndex].m_link
<< ", IDX=" << link_iter->m_elementIndex
- << endreq;
+ << endmsg;
#endif
link_iter++;
}
diff --git a/Control/DataModelAthenaPool/DataModelAthenaPool/NavigableCnv_p1.icc b/Control/DataModelAthenaPool/DataModelAthenaPool/NavigableCnv_p1.icc
index e8d13bca5733c085b0d60ba56552b53f0dfee98c..ce13b34b4d76f0a4d6f4c59c074921a644c8a026 100755
--- a/Control/DataModelAthenaPool/DataModelAthenaPool/NavigableCnv_p1.icc
+++ b/Control/DataModelAthenaPool/DataModelAthenaPool/NavigableCnv_p1.icc
@@ -34,7 +34,7 @@ NavigableCnv_p1<NAV, RPAR>::transToPers(const Navigable_t* trans,
#ifdef NAV_P1_DEBUG
msg << MSG::DEBUG << "NavigableCnv_p1::transToPers(): Weight["
<< pers->m_parameters.size()-1 <<"]="
- << pers->m_parameters[pers->m_parameters.size()-1] << endreq;
+ << pers->m_parameters[pers->m_parameters.size()-1] << endmsg;
#endif
elv.push_back( iter.getElement() );
pers->m_parameters.push_back( iter.getParameter() );
@@ -64,7 +64,7 @@ void NavigableCnv_p1<NAV, RPAR >::persToTrans(const PersNavigable_t* pers, Navig
trans->insertElement (elv[i], pers->m_parameters[i], size);
#ifdef NAV_P1_DEBUG
msg << MSG::DEBUG << "NavigableCnv_p1::PersToTrans(): Weight[" <<i <<"]="
- << pers->m_parameters[i] << endreq;
+ << pers->m_parameters[i] << endmsg;
#endif
}
}
diff --git a/Control/DataModelAthenaPool/DataModelAthenaPool/NavigableCnv_p2.icc b/Control/DataModelAthenaPool/DataModelAthenaPool/NavigableCnv_p2.icc
index 615b2f63f3870ac01827b6f38b1d605bbbf4725d..fc95e9b3c218c827882528e31305eee7406ee40f 100644
--- a/Control/DataModelAthenaPool/DataModelAthenaPool/NavigableCnv_p2.icc
+++ b/Control/DataModelAthenaPool/DataModelAthenaPool/NavigableCnv_p2.icc
@@ -32,7 +32,7 @@ NavigableCnv_p2<NAV, RPAR>
#ifdef NAV_P2_DEBUG
msg << MSG::DEBUG << "NavigableCnv_p2::transToPers(): Weight["
<< pers->m_parameters.size()-1 <<"]="
- << pers->m_parameters[pers->m_parameters.size()-1] << endreq;
+ << pers->m_parameters[pers->m_parameters.size()-1] << endmsg;
#endif
elv.push_back( iter.getElement() );
pers->m_parameters.push_back( iter.getParameter() );
@@ -57,7 +57,7 @@ void NavigableCnv_p2<NAV, RPAR >::persToTrans(const PersNavigable_t* pers, Navig
trans->insertElement (elv[i], pers->m_parameters[i], size);
#ifdef NAV_P2_DEBUG
msg << MSG::DEBUG << "NavigableCnv_p2::PersToTrans(): Weight[" <<i <<"]="
- << pers->m_parameters[i] << endreq;
+ << pers->m_parameters[i] << endmsg;
#endif
}
}
diff --git a/Control/DataModelAthenaPool/DataModelAthenaPool/NavigableVectorCnv_p1.h b/Control/DataModelAthenaPool/DataModelAthenaPool/NavigableVectorCnv_p1.h
index 91bf7de26e72b4051c9ecc7cf95b879ef88059c1..ccea91faa94284160776f876a61ebf1c231a0c4c 100755
--- a/Control/DataModelAthenaPool/DataModelAthenaPool/NavigableVectorCnv_p1.h
+++ b/Control/DataModelAthenaPool/DataModelAthenaPool/NavigableVectorCnv_p1.h
@@ -30,7 +30,14 @@ public:
typedef typename GeneratePersNavVectorType< Navigable_t, RPAR >::type PersNavigableVector_t;
typedef ElementLinkVector<typename Navigable_t::container_type > ElementLinkVect_t;
- NavigableVectorCnv_p1() {}
+ NavigableVectorCnv_p1() :
+ m_pers(nullptr),
+ m_log(nullptr),
+ m_tempLinkVect(nullptr),
+ m_linkIterator(0),
+ m_navigableIterator(0)
+ {}
+
// standard interface for TP converter
// (takes the whole vector of navigables at once)
@@ -76,7 +83,13 @@ public:
typedef typename GeneratePersNavVectorType< Navigable_t >::type PersNavigableVector_t;
typedef ElementLinkVector<typename Navigable_t::container_type > ElementLinkVect_t;
- NavigableVectorCnv_p1() {}
+ NavigableVectorCnv_p1() :
+ m_pers(nullptr),
+ m_log(nullptr),
+ m_tempLinkVect(nullptr),
+ m_linkIterator(0),
+ m_navigableIterator(0)
+ {}
// standard interface for TP converter
// (takes the whole vector of navigables at once)
diff --git a/Control/DataModelAthenaPool/DataModelAthenaPool/NavigableVectorCnv_p2.h b/Control/DataModelAthenaPool/DataModelAthenaPool/NavigableVectorCnv_p2.h
index 38e0e509b64aaf0f4f9851b0ec3fdd67d82db081..6512287af46f29ed1383ebb3baa908cbec1f7880 100644
--- a/Control/DataModelAthenaPool/DataModelAthenaPool/NavigableVectorCnv_p2.h
+++ b/Control/DataModelAthenaPool/DataModelAthenaPool/NavigableVectorCnv_p2.h
@@ -27,7 +27,12 @@ public:
typedef typename NavigableVector_t::value_type Navigable_t;
typedef typename GeneratePersNavVectorType_p2< Navigable_t, RPAR >::type PersNavigableVector_t;
- NavigableVectorCnv_p2() {}
+ NavigableVectorCnv_p2() :
+ m_pers(nullptr),
+ m_log(nullptr),
+ m_linkIterator(0),
+ m_navigableIterator(0)
+ {}
// standard interface for TP converter
// (takes the whole vector of navigables at once)
@@ -72,7 +77,12 @@ public:
typedef typename NavigableVector_t::value_type Navigable_t;
typedef typename GeneratePersNavVectorType_p2< Navigable_t >::type PersNavigableVector_t;
- NavigableVectorCnv_p2() {}
+ NavigableVectorCnv_p2() :
+ m_pers(nullptr),
+ m_log(nullptr),
+ m_linkIterator(0),
+ m_navigableIterator(0)
+ {}
// standard interface for TP converter
// (takes the whole vector of navigables at once)
diff --git a/Control/DataModelAthenaPool/src/UserDataStoreCnv.cxx b/Control/DataModelAthenaPool/src/UserDataStoreCnv.cxx
index 3ef60524eb5b2a5a856e2a345715ebea64c67fbb..0310afd6ae9dfa9dd6291b6315af69b1f4b4665d 100644
--- a/Control/DataModelAthenaPool/src/UserDataStoreCnv.cxx
+++ b/Control/DataModelAthenaPool/src/UserDataStoreCnv.cxx
@@ -9,7 +9,7 @@ UserDataStoreCnv::UserDataStoreCnv(ISvcLocator* svcloc) :
T_AthenaPoolCustomCnv<UserDataStore, UserDataStore_p1 >( svcloc),
m_converterP1(),
m_guidP1("1D3E6FC1-54CD-4239-9714-9C467160F3FA"),
- m_log(messageService(), "UserDataStoreCnv")
+ m_log(msgSvc(), "UserDataStoreCnv")
{}
@@ -27,15 +27,15 @@ UserDataStore* UserDataStoreCnv::createTransient () {
UserDataStore* trans=0;
if (compareClassGuid(m_guidP1)) {
- if (m_log.level() <= MSG::DEBUG) m_log << MSG::DEBUG << "Reading version UserDataStore_p1" << endreq;
+ if (m_log.level() <= MSG::DEBUG) m_log << MSG::DEBUG << "Reading version UserDataStore_p1" << endmsg;
trans=new UserDataStore();
UserDataStore_p1* pers=poolReadObject<UserDataStore_p1>();
m_converterP1.persToTrans(*pers,*trans,m_log);
- if (m_log.level() <= MSG::DEBUG) m_log << MSG::DEBUG << "Done converting UserDataStore_p1 to UserDataStore" << endreq;
+ if (m_log.level() <= MSG::DEBUG) m_log << MSG::DEBUG << "Done converting UserDataStore_p1 to UserDataStore" << endmsg;
delete pers;
}
else {
- m_log << MSG::ERROR << "Unsupported persistent version of UserDataSvc GUID=" << m_classID.toString() << endreq;
+ m_log << MSG::ERROR << "Unsupported persistent version of UserDataSvc GUID=" << m_classID.toString() << endmsg;
//throw std::runtime_error("Unsupported persistent version of UserDataSvc");
}
return trans;
diff --git a/Control/DataModelAthenaPool/src/UserDataStoreCnv_p1.cxx b/Control/DataModelAthenaPool/src/UserDataStoreCnv_p1.cxx
index fe537917473a0de5558c03a05cc7fcbd21e3b77c..080b35e0a38acf500ab9b8a6af58b7583ebd8fc2 100644
--- a/Control/DataModelAthenaPool/src/UserDataStoreCnv_p1.cxx
+++ b/Control/DataModelAthenaPool/src/UserDataStoreCnv_p1.cxx
@@ -149,7 +149,7 @@ UserDataStoreCnv_p1::transToPers(const UserDataStore& transObj, UserDataStore_p1
free(tyNameS);
mLog << MSG::ERROR << "while writing out UserData label " << transObj.m_labelTable.getLabel(itVar->first)
- <<": The type " << tyName << " is not supported." << endreq;
+ <<": The type " << tyName << " is not supported." << endmsg;
}
}// end loop over variables
}// end loop over objects (barcodes)
@@ -258,7 +258,7 @@ UserDataStoreCnv_p1::persToTrans(const UserDataStore_p1& persObj, UserDataStore&
}
else {
mLog << MSG::ERROR << "while reading in UserData label " << transObj.m_labelTable.getLabel(valhash)
- <<": Encountered unsupported type (" << ty << ")" << endreq;
+ <<": Encountered unsupported type (" << ty << ")" << endmsg;
}// end-else
}//end loop over attributes (=hashes)