From f59297314b3fbf2169c8b07beff1036e2d1e0bff Mon Sep 17 00:00:00 2001
From: scott snyder <snyder@bnl.gov>
Date: Fri, 26 Oct 2018 14:17:27 +0200
Subject: [PATCH] MuonEDM_AssociationObjects: CLIDSvc -> AthenaKernel
Update references to headers in CLIDSvc moved to AthenaKernel.
Also remove unneeded dependency on SGTools.
---
.../MuonRecEvent/MuonEDM_AssociationObjects/CMakeLists.txt | 7 +++----
.../MuonEDM_AssociationObjects/MuonSegPatAssMap.h | 4 ++--
.../MuonSegmentCombPatternCombAssociationMap.h | 6 +++---
3 files changed, 8 insertions(+), 9 deletions(-)
diff --git a/MuonSpectrometer/MuonReconstruction/MuonRecEvent/MuonEDM_AssociationObjects/CMakeLists.txt b/MuonSpectrometer/MuonReconstruction/MuonRecEvent/MuonEDM_AssociationObjects/CMakeLists.txt
index 6057823c309..6362bfa0592 100644
--- a/MuonSpectrometer/MuonReconstruction/MuonRecEvent/MuonEDM_AssociationObjects/CMakeLists.txt
+++ b/MuonSpectrometer/MuonReconstruction/MuonRecEvent/MuonEDM_AssociationObjects/CMakeLists.txt
@@ -7,9 +7,8 @@ atlas_subdir( MuonEDM_AssociationObjects )
# Declare the package's dependencies:
atlas_depends_on_subdirs( PUBLIC
- Control/CLIDSvc
+ Control/AthenaKernel
Control/AthLinks
- Control/SGTools
MuonSpectrometer/MuonReconstruction/MuonRecEvent/MuonPattern
MuonSpectrometer/MuonReconstruction/MuonRecEvent/MuonSegment )
@@ -17,9 +16,9 @@ atlas_depends_on_subdirs( PUBLIC
atlas_add_library( MuonEDM_AssociationObjects
src/*.cxx
PUBLIC_HEADERS MuonEDM_AssociationObjects
- LINK_LIBRARIES AthLinks SGTools MuonPattern MuonSegment )
+ LINK_LIBRARIES AthLinks AthenaKernel MuonPattern MuonSegment )
atlas_add_dictionary( MuonEDM_AssociationObjectsDict
MuonEDM_AssociationObjects/MuonSegmentCombPatternCombAssociationMap.h
MuonEDM_AssociationObjects/selection.xml
- LINK_LIBRARIES AthLinks SGTools MuonPattern MuonSegment)
+ LINK_LIBRARIES AthLinks MuonPattern MuonSegment)
diff --git a/MuonSpectrometer/MuonReconstruction/MuonRecEvent/MuonEDM_AssociationObjects/MuonEDM_AssociationObjects/MuonSegPatAssMap.h b/MuonSpectrometer/MuonReconstruction/MuonRecEvent/MuonEDM_AssociationObjects/MuonEDM_AssociationObjects/MuonSegPatAssMap.h
index bd642193c4b..c2ef3a582e5 100755
--- a/MuonSpectrometer/MuonReconstruction/MuonRecEvent/MuonEDM_AssociationObjects/MuonEDM_AssociationObjects/MuonSegPatAssMap.h
+++ b/MuonSpectrometer/MuonReconstruction/MuonRecEvent/MuonEDM_AssociationObjects/MuonEDM_AssociationObjects/MuonSegPatAssMap.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
*/
///////////////////////////////////////////////////////////////////
@@ -12,7 +12,7 @@
#include "AthLinks/AssociationMap.h"
#include "MuonSegment/MuonSegmentCombinationCollection.h"
#include "MuonPattern/MuonPatternCombinationCollection.h"
-#include "CLIDSvc/CLASS_DEF.h"
+#include "AthenaKernel/CLASS_DEF.h"
namespace Muon {
diff --git a/MuonSpectrometer/MuonReconstruction/MuonRecEvent/MuonEDM_AssociationObjects/MuonEDM_AssociationObjects/MuonSegmentCombPatternCombAssociationMap.h b/MuonSpectrometer/MuonReconstruction/MuonRecEvent/MuonEDM_AssociationObjects/MuonEDM_AssociationObjects/MuonSegmentCombPatternCombAssociationMap.h
index d923f2b4743..597eee3b5ac 100644
--- a/MuonSpectrometer/MuonReconstruction/MuonRecEvent/MuonEDM_AssociationObjects/MuonEDM_AssociationObjects/MuonSegmentCombPatternCombAssociationMap.h
+++ b/MuonSpectrometer/MuonReconstruction/MuonRecEvent/MuonEDM_AssociationObjects/MuonEDM_AssociationObjects/MuonSegmentCombPatternCombAssociationMap.h
@@ -1,10 +1,10 @@
/*
- 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 MUON_EDM_ASSOCIATIONOBJECTS_MUONSEGPATCOMBASSOCMAP_H
#define MUON_EDM_ASSOCIATIONOBJECTS_MUONSEGPATCOMBASSOCMAP_H
-#include "CLIDSvc/CLASS_DEF.h"
+#include "AthenaKernel/CLASS_DEF.h"
#include <map>
namespace Muon {
@@ -16,4 +16,4 @@ namespace Muon {
CLASS_DEF( Muon::MuonSegmentCombPatternCombAssociationMap , 22914797 , 1 )
-#endif
\ No newline at end of file
+#endif
--
GitLab