From 5dbce9f5c88b3b848f6a7d88b99fa3b36daf9957 Mon Sep 17 00:00:00 2001
From: Scott Snyder <scott.snyder@cern.ch>
Date: Sun, 15 May 2016 14:44:34 +0200
Subject: [PATCH] 'Set the store pointer in the link, if needed. Remove
#define private.' (GeneratorObjectsTPCnv-00-06-11)
* Tagging GeneratorObjectsTPCnv-00-06-11
* src/HepMcParticleLinkCnv_p1.cxx: Set the store pointer in the
link, if needed.
* GeneratorObjectsTPCnv/McEventCollectionCnv_p1.h: Remove #define
private.
Former-commit-id: beaacc7c328170499a633681907c7964b32a219c
---
.../GeneratorObjectsTPCnv/HepMcParticleLinkCnv_p1.h | 4 ----
.../GeneratorObjectsTPCnv/src/HepMcParticleLinkCnv_p1.cxx | 2 ++
2 files changed, 2 insertions(+), 4 deletions(-)
diff --git a/Generators/GeneratorObjectsTPCnv/GeneratorObjectsTPCnv/HepMcParticleLinkCnv_p1.h b/Generators/GeneratorObjectsTPCnv/GeneratorObjectsTPCnv/HepMcParticleLinkCnv_p1.h
index 072d0a09732..3639f774cf5 100755
--- a/Generators/GeneratorObjectsTPCnv/GeneratorObjectsTPCnv/HepMcParticleLinkCnv_p1.h
+++ b/Generators/GeneratorObjectsTPCnv/GeneratorObjectsTPCnv/HepMcParticleLinkCnv_p1.h
@@ -18,11 +18,7 @@
#include "AthenaPoolCnvSvc/T_AthenaPoolTPConverter.h"
// GeneratorObjects includes
-#define private public
-#define protected public
#include "GeneratorObjects/HepMcParticleLink.h"
-#undef private
-#undef protected
// GeneratorObjectsAthenaPool includes
#include "GeneratorObjectsTPCnv/HepMcParticleLink_p1.h"
diff --git a/Generators/GeneratorObjectsTPCnv/src/HepMcParticleLinkCnv_p1.cxx b/Generators/GeneratorObjectsTPCnv/src/HepMcParticleLinkCnv_p1.cxx
index a7bea79f7e1..77481f2295b 100755
--- a/Generators/GeneratorObjectsTPCnv/src/HepMcParticleLinkCnv_p1.cxx
+++ b/Generators/GeneratorObjectsTPCnv/src/HepMcParticleLinkCnv_p1.cxx
@@ -32,6 +32,8 @@ void HepMcParticleLinkCnv_p1::persToTrans( const HepMcParticleLink_p1* persObj,
{
// msg << MSG::DEBUG << "Loading HepMcParticleLink from persistent state..."
// << endreq;
+ if (transObj->m_ptrs.m_dict == nullptr)
+ transObj->init_dict();
transObj->m_extBarcode =
HepMcParticleLink::ExtendedBarCode( persObj->m_barcode,
persObj->m_mcEvtIndex );
--
GitLab