From 97ca01817faf8c6f21b87850262339efda995a89 Mon Sep 17 00:00:00 2001
From: scott snyder <snyder@bnl.gov>
Date: Sun, 9 Dec 2018 01:30:44 +0100
Subject: [PATCH] IOVDbTestConditions: CLIDSvc -> AthenaKernel
Adjust for header moved from CLIDSvc to AthenaKernel.
Also remove unneeded dependency on SGTools.
---
AtlasTest/DatabaseTest/IOVDbTestConditions/CMakeLists.txt | 7 +++----
.../IOVDbTestConditions/IOVDbTestAmdbCorrection.h | 4 ++--
.../IOVDbTestConditions/IOVDbTestMDTEleMap.h | 4 ++--
.../IOVDbTestConditions/IOVDbTestMDTEleMapColl.h | 4 ++--
4 files changed, 9 insertions(+), 10 deletions(-)
diff --git a/AtlasTest/DatabaseTest/IOVDbTestConditions/CMakeLists.txt b/AtlasTest/DatabaseTest/IOVDbTestConditions/CMakeLists.txt
index 1913081ff44..f27f17e594a 100644
--- a/AtlasTest/DatabaseTest/IOVDbTestConditions/CMakeLists.txt
+++ b/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 )
diff --git a/AtlasTest/DatabaseTest/IOVDbTestConditions/IOVDbTestConditions/IOVDbTestAmdbCorrection.h b/AtlasTest/DatabaseTest/IOVDbTestConditions/IOVDbTestConditions/IOVDbTestAmdbCorrection.h
index 77ceda9a506..042f9cf6131 100755
--- a/AtlasTest/DatabaseTest/IOVDbTestConditions/IOVDbTestConditions/IOVDbTestAmdbCorrection.h
+++ b/AtlasTest/DatabaseTest/IOVDbTestConditions/IOVDbTestConditions/IOVDbTestAmdbCorrection.h
@@ -1,5 +1,5 @@
/*
- 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{
diff --git a/AtlasTest/DatabaseTest/IOVDbTestConditions/IOVDbTestConditions/IOVDbTestMDTEleMap.h b/AtlasTest/DatabaseTest/IOVDbTestConditions/IOVDbTestConditions/IOVDbTestMDTEleMap.h
index 2a577c33920..a24f72aed89 100755
--- a/AtlasTest/DatabaseTest/IOVDbTestConditions/IOVDbTestConditions/IOVDbTestMDTEleMap.h
+++ b/AtlasTest/DatabaseTest/IOVDbTestConditions/IOVDbTestConditions/IOVDbTestMDTEleMap.h
@@ -1,5 +1,5 @@
/*
- 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
diff --git a/AtlasTest/DatabaseTest/IOVDbTestConditions/IOVDbTestConditions/IOVDbTestMDTEleMapColl.h b/AtlasTest/DatabaseTest/IOVDbTestConditions/IOVDbTestConditions/IOVDbTestMDTEleMapColl.h
index e91ffd319cb..308d235489c 100755
--- a/AtlasTest/DatabaseTest/IOVDbTestConditions/IOVDbTestConditions/IOVDbTestMDTEleMapColl.h
+++ b/AtlasTest/DatabaseTest/IOVDbTestConditions/IOVDbTestConditions/IOVDbTestMDTEleMapColl.h
@@ -1,5 +1,5 @@
/*
- 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
--
GitLab