From 49cd8ab86cd4b69f7056be14be19fc7a0f08684c Mon Sep 17 00:00:00 2001
From: christos <christos@cern.ch>
Date: Wed, 9 Sep 2020 19:58:19 +0100
Subject: [PATCH] Place DATAVECTOR_BASE at end of Jet_v1.h, similar to rel 21.2
---
Event/xAOD/xAODJet/xAODJet/versions/JetContainer_v1.h | 3 ---
Event/xAOD/xAODJet/xAODJet/versions/Jet_v1.h | 3 +++
2 files changed, 3 insertions(+), 3 deletions(-)
diff --git a/Event/xAOD/xAODJet/xAODJet/versions/JetContainer_v1.h b/Event/xAOD/xAODJet/xAODJet/versions/JetContainer_v1.h
index f7eed7b138e..b7f28124d00 100644
--- a/Event/xAOD/xAODJet/xAODJet/versions/JetContainer_v1.h
+++ b/Event/xAOD/xAODJet/xAODJet/versions/JetContainer_v1.h
@@ -14,9 +14,6 @@
// Local include(s):
#include "xAODJet/versions/Jet_v1.h"
-// Declare IParticle as a base class of Jet_v1:
-DATAVECTOR_BASE( xAOD::Jet_v1, xAOD::IParticle );
-
namespace xAOD {
/// The container is a simple typedef for now
typedef DataVector< xAOD::Jet_v1 > JetContainer_v1;
diff --git a/Event/xAOD/xAODJet/xAODJet/versions/Jet_v1.h b/Event/xAOD/xAODJet/xAODJet/versions/Jet_v1.h
index fff4300fedd..612098c0f89 100644
--- a/Event/xAOD/xAODJet/xAODJet/versions/Jet_v1.h
+++ b/Event/xAOD/xAODJet/xAODJet/versions/Jet_v1.h
@@ -360,6 +360,9 @@ namespace xAOD {
} // namespace xAOD
+// Declare IParticle as a base class of Jet_v1:
+DATAVECTOR_BASE( xAOD::Jet_v1, xAOD::IParticle );
+
#include "xAODJet/versions/Jet_v1.icc"
#endif // XAODJET_VERSIONS_JET_V1_H
--
GitLab