Merge branch 'clidsvc.MuonIdHelpers-20181025' into 'master'

MuonIdHelpers: CLIDSvc -> AthenaKernel

See merge request atlas/athena!15364

MuonSpectrometer/MuonIdHelpers/CMakeLists.txt

@@ -12,8 +12,7 @@ if( NOT XAOD_STANDALONE )
    atlas_depends_on_subdirs(
       PUBLIC
       Control/AthenaBaseComps
-      Control/CLIDSvc
-      Control/SGTools
+      Control/AthenaKernel
       DetectorDescription/AtlasDetDescr
       DetectorDescription/IdDict
       DetectorDescription/Identifier
@@ -26,7 +25,7 @@ endif()
 if( NOT XAOD_STANDALONE )
    set( extra_sources src/*.cxx )
    set( extra_libraries
-      LINK_LIBRARIES AthenaBaseComps SGTools AtlasDetDescr IdDict Identifier
+      LINK_LIBRARIES AthenaKernel AthenaBaseComps AtlasDetDescr IdDict Identifier
       PRIVATE_LINK_LIBRARIES IdDictParser GaudiKernel )
 endif()
 

MuonSpectrometer/MuonIdHelpers/MuonIdHelpers/MuonIdHelper.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
 */
 
 // ******************************************************************************
@@ -21,7 +21,7 @@
 #include "IdDict/IdDictDefs.h"
 #include "Identifier/Range.h"
 #include "Identifier/IdHelper.h"
-#include "CLIDSvc/CLASS_DEF.h"
+#include "AthenaKernel/CLASS_DEF.h"
 
 #include <cassert>
 #include <string>