From e664550e1edd7b7977cfdd40c3823cdd4a64f536 Mon Sep 17 00:00:00 2001 From: scott snyder <scott.snyder@cern.ch> Date: Thu, 22 Mar 2018 14:21:42 +0100 Subject: [PATCH] IDC_OverlayBase: DataModel -> AthContainers. Remove reference to obsolete package DataModel. Adjust references to headers moved to AthenaKernel. Former-commit-id: bc8821a1d42f4a72e6f8ba48e75d66fa3a9b04cc --- Event/EventOverlay/IDC_OverlayBase/CMakeLists.txt | 4 ++-- .../IDC_OverlayBase/IDC_OverlayBase/IDC_OverlayBase.icc | 2 +- .../IDC_OverlayBase/IDC_OverlayBase/IDC_OverlayCommon.icc | 3 +-- 3 files changed, 4 insertions(+), 5 deletions(-) diff --git a/Event/EventOverlay/IDC_OverlayBase/CMakeLists.txt b/Event/EventOverlay/IDC_OverlayBase/CMakeLists.txt index 75fc4594127..99c2cc620c6 100644 --- a/Event/EventOverlay/IDC_OverlayBase/CMakeLists.txt +++ b/Event/EventOverlay/IDC_OverlayBase/CMakeLists.txt @@ -8,12 +8,12 @@ atlas_subdir( IDC_OverlayBase ) # Declare the package's dependencies: atlas_depends_on_subdirs( PUBLIC Control/AthenaBaseComps - Control/DataModel + Control/AthContainers DetectorDescription/Identifier Event/EventOverlay/OverlayAlgBase ) # Component(s) in the package: atlas_add_library( IDC_OverlayBase PUBLIC_HEADERS IDC_OverlayBase - LINK_LIBRARIES AthenaBaseComps DataModel Identifier OverlayAlgBase ) + LINK_LIBRARIES AthenaBaseComps AthContainers Identifier OverlayAlgBase ) diff --git a/Event/EventOverlay/IDC_OverlayBase/IDC_OverlayBase/IDC_OverlayBase.icc b/Event/EventOverlay/IDC_OverlayBase/IDC_OverlayBase/IDC_OverlayBase.icc index 778398e0eba..711db40f69f 100644 --- a/Event/EventOverlay/IDC_OverlayBase/IDC_OverlayBase/IDC_OverlayBase.icc +++ b/Event/EventOverlay/IDC_OverlayBase/IDC_OverlayBase/IDC_OverlayBase.icc @@ -12,7 +12,7 @@ #include "AthenaBaseComps/AthMsgStreamMacros.h" -#include "DataModel/DataVector.h" +#include "AthContainers/DataVector.h" #include <sstream> #include <typeinfo> diff --git a/Event/EventOverlay/IDC_OverlayBase/IDC_OverlayBase/IDC_OverlayCommon.icc b/Event/EventOverlay/IDC_OverlayBase/IDC_OverlayBase/IDC_OverlayCommon.icc index e3b27d65eb4..8459c06beb8 100644 --- a/Event/EventOverlay/IDC_OverlayBase/IDC_OverlayBase/IDC_OverlayCommon.icc +++ b/Event/EventOverlay/IDC_OverlayBase/IDC_OverlayBase/IDC_OverlayCommon.icc @@ -11,12 +11,11 @@ #include "StoreGate/ReadHandle.h" #include "StoreGate/WriteHandle.h" -#include "CxxUtils/make_unique.h" #include "AthenaBaseComps/AthMsgStreamMacros.h" -#include "DataModel/DataVector.h" +#include "AthContainers/DataVector.h" #include <sstream> -- GitLab