From 662ee90fb2dff7cb7ae92a3dc613dc4a35230258 Mon Sep 17 00:00:00 2001
From: scott snyder <snyder@bnl.gov>
Date: Wed, 19 Apr 2017 22:07:08 +0200
Subject: [PATCH] TrigT1CaloToolInterfaces: Fix undefined behavior warning.
If we reference DataVector<xAOD::TriggerTower>, we need to include
TriggerTowerContainer.h, not just TriggerTower.h. Otherwise, we won't
see the DATAVECTOR_BASE macro declaring the TriggerTower inheritance,
and thus we'll be using a _different_ DataVector type. This then
gives ubsan warnings.
---
.../TrigT1CaloToolInterfaces/IL1CPMTowerTools.h | 2 +-
.../TrigT1CaloToolInterfaces/IL1TriggerTowerTool.h | 2 +-
2 files changed, 2 insertions(+), 2 deletions(-)
diff --git a/Trigger/TrigT1/TrigT1CaloToolInterfaces/TrigT1CaloToolInterfaces/IL1CPMTowerTools.h b/Trigger/TrigT1/TrigT1CaloToolInterfaces/TrigT1CaloToolInterfaces/IL1CPMTowerTools.h
index 3901ec7bfc5..0b47a1a69dc 100755
--- a/Trigger/TrigT1/TrigT1CaloToolInterfaces/TrigT1CaloToolInterfaces/IL1CPMTowerTools.h
+++ b/Trigger/TrigT1/TrigT1CaloToolInterfaces/TrigT1CaloToolInterfaces/IL1CPMTowerTools.h
@@ -10,7 +10,7 @@
#include "GaudiKernel/IAlgTool.h"
#include "TrigT1CaloEvent/TriggerTower.h"
-#include "xAODTrigL1Calo/TriggerTower.h"
+#include "xAODTrigL1Calo/TriggerTowerContainer.h"
#include "TrigT1CaloEvent/CPMTower.h"
#include "xAODTrigL1Calo/CPMTower.h"
#include <map>
diff --git a/Trigger/TrigT1/TrigT1CaloToolInterfaces/TrigT1CaloToolInterfaces/IL1TriggerTowerTool.h b/Trigger/TrigT1/TrigT1CaloToolInterfaces/TrigT1CaloToolInterfaces/IL1TriggerTowerTool.h
index 18b25eb59a5..2b14f11f914 100644
--- a/Trigger/TrigT1/TrigT1CaloToolInterfaces/TrigT1CaloToolInterfaces/IL1TriggerTowerTool.h
+++ b/Trigger/TrigT1/TrigT1CaloToolInterfaces/TrigT1CaloToolInterfaces/IL1TriggerTowerTool.h
@@ -21,7 +21,7 @@
#include "Identifier/Identifier.h"
#include "Identifier/HWIdentifier.h"
#include "TrigT1CaloCalibConditions/L1CaloCoolChannelId.h"
-#include "xAODTrigL1Calo/TriggerTower.h"
+#include "xAODTrigL1Calo/TriggerTowerContainer.h"
namespace LVL1
{
--
GitLab