Merge branch 'ubsan.TrigT1CaloTools-20170419' into 'master'

TrigT1CaloToolInterfaces+TrigT1CaloTools: Fix undefined behavior warning.

See merge request !1022

Former-commit-id: 5a9a0f11

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>

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
 {

Trigger/TrigT1/TrigT1CaloTools/TrigT1CaloTools/L1TriggerTowerTool.h

@@ -21,7 +21,7 @@
 #include "GaudiKernel/ToolHandle.h"
 #include "GaudiKernel/ServiceHandle.h"
 #include "TrigT1CaloToolInterfaces/IL1TriggerTowerTool.h"
-#include "xAODTrigL1Calo/TriggerTower.h"
+#include "xAODTrigL1Calo/TriggerTowerContainer.h"
 
 class CaloIdManager;
 class CaloLVL1_ID;