From 42a103b3fa3eb775fe0950d50a22c4d395f6d891 Mon Sep 17 00:00:00 2001
From: scott snyder <snyder@bnl.gov>
Date: Tue, 2 Oct 2018 09:36:46 +0200
Subject: [PATCH] AFP_SimEvByteStreamCnvSvcBase: CLIDSvc -> AthenaKernel
Remove references to obsolete package CLIDSvc; header moved to AthenaKernel.
Also remove unneeded dependency on SGTools.
---
.../AFP/AFP_SimEv/AFP_SimEv/AFP_SIDSimHitCollection.h | 4 +---
.../AFP/AFP_SimEv/AFP_SimEv/AFP_TDSimHitCollection.h | 4 +---
ForwardDetectors/AFP/AFP_SimEv/CMakeLists.txt | 7 +++----
3 files changed, 5 insertions(+), 10 deletions(-)
diff --git a/ForwardDetectors/AFP/AFP_SimEv/AFP_SimEv/AFP_SIDSimHitCollection.h b/ForwardDetectors/AFP/AFP_SimEv/AFP_SimEv/AFP_SIDSimHitCollection.h
index 17c6cd3fe57..c26de7f1366 100644
--- a/ForwardDetectors/AFP/AFP_SimEv/AFP_SimEv/AFP_SIDSimHitCollection.h
+++ b/ForwardDetectors/AFP/AFP_SimEv/AFP_SimEv/AFP_SIDSimHitCollection.h
@@ -8,9 +8,7 @@
#include "AFP_SimEv/AFP_SIDSimHit.h"
#include "HitManagement/AtlasHitsVector.h"
-#ifndef __CINT__
-#include "CLIDSvc/CLASS_DEF.h"
-#endif //__CINT__
+#include "AthenaKernel/CLASS_DEF.h"
typedef AtlasHitsVector<AFP_SIDSimHit> AFP_SIDSimHitCollection;
typedef AtlasHitsVector<AFP_SIDSimHit>::iterator AFP_SIDSimHitIter;
diff --git a/ForwardDetectors/AFP/AFP_SimEv/AFP_SimEv/AFP_TDSimHitCollection.h b/ForwardDetectors/AFP/AFP_SimEv/AFP_SimEv/AFP_TDSimHitCollection.h
index 5534ce24af2..607238e0e9d 100644
--- a/ForwardDetectors/AFP/AFP_SimEv/AFP_SimEv/AFP_TDSimHitCollection.h
+++ b/ForwardDetectors/AFP/AFP_SimEv/AFP_SimEv/AFP_TDSimHitCollection.h
@@ -9,9 +9,7 @@
#include "AFP_SimEv/AFP_TDSimHit.h"
#include "HitManagement/AtlasHitsVector.h"
-#ifndef __CINT__
-#include "CLIDSvc/CLASS_DEF.h"
-#endif //__CINT__
+#include "AthenaKernel/CLASS_DEF.h"
typedef AtlasHitsVector<AFP_TDSimHit> AFP_TDSimHitCollection;
typedef AtlasHitsVector<AFP_TDSimHit>::iterator AFP_TDSimHitIter;
diff --git a/ForwardDetectors/AFP/AFP_SimEv/CMakeLists.txt b/ForwardDetectors/AFP/AFP_SimEv/CMakeLists.txt
index f75234f2963..6abfa8636b6 100644
--- a/ForwardDetectors/AFP/AFP_SimEv/CMakeLists.txt
+++ b/ForwardDetectors/AFP/AFP_SimEv/CMakeLists.txt
@@ -7,8 +7,7 @@ atlas_subdir( AFP_SimEv )
# Declare the package's dependencies:
atlas_depends_on_subdirs( PUBLIC
- Control/CLIDSvc
- Control/SGTools
+ Control/AthenaKernel
Simulation/HitManagement
PRIVATE
GaudiKernel )
@@ -21,12 +20,12 @@ atlas_add_library( AFP_SimEv
src/*.cxx
PUBLIC_HEADERS AFP_SimEv
PRIVATE_INCLUDE_DIRS ${ROOT_INCLUDE_DIRS}
- LINK_LIBRARIES SGTools HitManagement
+ LINK_LIBRARIES HitManagement
PRIVATE_LINK_LIBRARIES ${ROOT_LIBRARIES} GaudiKernel )
atlas_add_dictionary( AFP_SimEvDict
AFP_SimEv/AFP_SimEvDict.h
AFP_SimEv/selection.xml
INCLUDE_DIRS ${ROOT_INCLUDE_DIRS}
- LINK_LIBRARIES ${ROOT_LIBRARIES} SGTools HitManagement GaudiKernel AFP_SimEv )
+ LINK_LIBRARIES ${ROOT_LIBRARIES} HitManagement GaudiKernel AFP_SimEv )
--
GitLab