'Set the store pointer in the link, if needed. Remove #define private.'...

'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

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"

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 );