Merge branch 'clidsvc.IOVDbTestConditions-20181210' into 'master'

IOVDbTestConditions: CLIDSvc -> AthenaKernel

See merge request atlas/athena!16621

Former-commit-id: dcf57a22

AtlasTest/DatabaseTest/IOVDbTestConditions/CMakeLists.txt

@@ -7,8 +7,7 @@ atlas_subdir( IOVDbTestConditions )
 
 # Declare the package's dependencies:
 atlas_depends_on_subdirs( PUBLIC
-                          Control/CLIDSvc
-                          Control/SGTools
+                          Control/AthenaKernel
                           Database/AthenaPOOL/AthenaPoolUtilities )
 
 # External dependencies:
@@ -23,12 +22,12 @@ atlas_add_library( IOVDbTestConditions
                    INCLUDE_DIRS ${CLHEP_INCLUDE_DIRS}
                    PRIVATE_INCLUDE_DIRS ${ROOT_INCLUDE_DIRS}
                    DEFINITIONS ${CLHEP_DEFINITIONS}
-                   LINK_LIBRARIES ${CLHEP_LIBRARIES} SGTools AthenaPoolUtilities
+                   LINK_LIBRARIES ${CLHEP_LIBRARIES} AthenaKernel AthenaPoolUtilities
                    PRIVATE_LINK_LIBRARIES ${ROOT_LIBRARIES} )
 
 atlas_add_dictionary( IOVDbTestConditionsDict
                       IOVDbTestConditions/IOVDbTestConditionsDict.h
                       IOVDbTestConditions/selection.xml
                       INCLUDE_DIRS ${ROOT_INCLUDE_DIRS} ${CLHEP_INCLUDE_DIRS}
-                      LINK_LIBRARIES ${ROOT_LIBRARIES} ${CLHEP_LIBRARIES} SGTools AthenaPoolUtilities IOVDbTestConditions )
+                      LINK_LIBRARIES ${ROOT_LIBRARIES} ${CLHEP_LIBRARIES} AthenaKernel AthenaPoolUtilities IOVDbTestConditions )
 

AtlasTest/DatabaseTest/IOVDbTestConditions/IOVDbTestConditions/IOVDbTestAmdbCorrection.h

 /*
-  Copyright (C) 2002-2017 CERN for the benefit of the ATLAS collaboration
+  Copyright (C) 2002-2018 CERN for the benefit of the ATLAS collaboration
 */
 
 /***************************************************************************
@@ -14,7 +14,7 @@
 #ifndef IOVDBTEST_AMDB_CORRECTION_H
 #define IOVDBTEST_AMDB_CORRECTION_H
 
-#include "CLIDSvc/CLASS_DEF.h"
+#include "AthenaKernel/CLASS_DEF.h"
 #include "CLHEP/Geometry/Point3D.h"
 
 class IOVDbTestAmdbCorrection{

AtlasTest/DatabaseTest/IOVDbTestConditions/IOVDbTestConditions/IOVDbTestMDTEleMap.h

 /*
-  Copyright (C) 2002-2017 CERN for the benefit of the ATLAS collaboration
+  Copyright (C) 2002-2018 CERN for the benefit of the ATLAS collaboration
 */
 
 /***************************************************************************
@@ -13,7 +13,7 @@
 //<doc><file>	$Id: IOVDbTestMDTEleMap.h,v 1.5 2006-03-26 17:26:30 schaffer Exp $
 //<version>	$Name: not supported by cvs2svn $
 
-#include "CLIDSvc/CLASS_DEF.h"
+#include "AthenaKernel/CLASS_DEF.h"
 #include<string>
 
 #define DIGIT 0

AtlasTest/DatabaseTest/IOVDbTestConditions/IOVDbTestConditions/IOVDbTestMDTEleMapColl.h

 /*
-  Copyright (C) 2002-2017 CERN for the benefit of the ATLAS collaboration
+  Copyright (C) 2002-2018 CERN for the benefit of the ATLAS collaboration
 */
 
 #ifndef IOVDBTESTCONDITIONS_IOVDBTESTMDTELEMAPCOLL_H
@@ -7,7 +7,7 @@
 
 #include "AthenaPoolUtilities/CondMultChanCollection.h"
 #include "IOVDbTestConditions/IOVDbTestMDTEleMap.h"
-#include "CLIDSvc/CLASS_DEF.h"
+#include "AthenaKernel/CLASS_DEF.h"
 
 /**This typedef represents a collection of IOVDbTestMDTEleMap objects. 
 It is a DataVector. It can be saved