Merge branch 'clidsvc.AFP_SimEv-20181003' into 'master'

AFP_SimEvByteStreamCnvSvcBase: CLIDSvc -> AthenaKernel

See merge request atlas/athena!14706

Former-commit-id: fe3fd29a

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;

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;

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 )