Skip to content
Snippets Groups Projects
Commit fddc1b5a authored by Takashi Yamanaka's avatar Takashi Yamanaka
Browse files

Merge branch 'cherry-pick-1c2e4982' into 'master'

Merge branch 'G4SimAthenaPOOL_buildWarning' into 'master

See merge request !1143
parents c432d372 e8de8726
No related branches found
No related tags found
No related merge requests found
...@@ -10,7 +10,7 @@ ...@@ -10,7 +10,7 @@
typedef AtlasHitsVector<TrackRecord> TrackRecordCollection_p0; typedef AtlasHitsVector<TrackRecord> TrackRecordCollection_p0;
TrackRecordCollection_PERS* TrackRecordCollectionCnv::createPersistent(TrackRecordCollection* transCont) { TrackRecordCollection_PERS* TrackRecordCollectionCnv::createPersistent(TrackRecordCollection* transCont) {
MsgStream mlog(messageService(), "TrackRecordCollectionConverter" ); MsgStream mlog(msgSvc(), "TrackRecordCollectionConverter" );
TrackRecordCollectionCnv_p2 converter; TrackRecordCollectionCnv_p2 converter;
TrackRecordCollection_PERS *persObj = converter.createPersistent( transCont, mlog ); TrackRecordCollection_PERS *persObj = converter.createPersistent( transCont, mlog );
return persObj; return persObj;
...@@ -19,7 +19,7 @@ TrackRecordCollection_PERS* TrackRecordCollectionCnv::createPersistent(TrackReco ...@@ -19,7 +19,7 @@ TrackRecordCollection_PERS* TrackRecordCollectionCnv::createPersistent(TrackReco
TrackRecordCollection* TrackRecordCollectionCnv::createTransient() { TrackRecordCollection* TrackRecordCollectionCnv::createTransient() {
MsgStream mlog(messageService(), "TrackRecordCollectionConverter" ); MsgStream mlog(msgSvc(), "TrackRecordCollectionConverter" );
TrackRecordCollectionCnv_p1 converter; TrackRecordCollectionCnv_p1 converter;
TrackRecordCollectionCnv_p2 converter_p2; TrackRecordCollectionCnv_p2 converter_p2;
TrackRecordCollection *trans_cont(0); TrackRecordCollection *trans_cont(0);
......
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