diff --git a/Event/xAOD/xAODTrigger/Root/TrigComposite_v1.cxx b/Event/xAOD/xAODTrigger/Root/TrigComposite_v1.cxx index 807c92173fa3b185f46daf842479e6e654e2551a..b1a24c0b3fb55021436dbd440c237ce512b15478 100644 --- a/Event/xAOD/xAODTrigger/Root/TrigComposite_v1.cxx +++ b/Event/xAOD/xAODTrigger/Root/TrigComposite_v1.cxx @@ -7,18 +7,6 @@ #include <algorithm> #include <stdexcept> -// In "standalone mode" xAOD::IParticleContainer doesn't have a CLID -// defined for it. But this code requires one to be set. -// -// The following is incredibly ugly, but this is the best that I could -// come up with on short notice. Note that the CLID value is copy-pasted -// from the IParticleContainer.h header. -#include "xAODBase/IParticleContainer.h" -#ifdef XAOD_STANDALONE -#include "xAODCore/CLASS_DEF.h" -CLASS_DEF( xAOD::IParticleContainer, 1241842700, 1 ) -#endif // XAOD_STANDALONE - // xAOD include(s): #include "xAODCore/AuxStoreAccessorMacros.h" diff --git a/Event/xAOD/xAODTrigger/xAODTrigger/versions/TrigComposite_v1.icc b/Event/xAOD/xAODTrigger/xAODTrigger/versions/TrigComposite_v1.icc index 43d27a7832b149d9ac81723f619652df56756c18..92c34d10d35fea0f0594ef0fdf18b4e6c41149b3 100644 --- a/Event/xAOD/xAODTrigger/xAODTrigger/versions/TrigComposite_v1.icc +++ b/Event/xAOD/xAODTrigger/xAODTrigger/versions/TrigComposite_v1.icc @@ -17,6 +17,17 @@ #include "AthContainers/normalizedTypeinfoName.h" #include "xAODCore/CLASS_DEF.h" +// In "standalone mode" xAOD::IParticleContainer doesn't have a CLID +// defined for it. But this code requires one to be set. +// +// The following is incredibly ugly, but this is the best that I could +// come up with on short notice. Note that the CLID value is copy-pasted +// from the IParticleContainer.h header. +#include "xAODBase/IParticleContainer.h" +#ifdef XAOD_STANDALONE +CLASS_DEF( xAOD::IParticleContainer, 1241842700, 1 ) +#endif // XAOD_STANDALONE + namespace xAOD { template< typename TYPE >