Merge branch 'clidsvc.LArDetDescr-20181021' into 'master'

LArDetDescrr: CLIDSvc -> AthenaKernel

See merge request atlas/athena!15217

LArCalorimeter/LArDetDescr/CMakeLists.txt

@@ -10,8 +10,7 @@ atlas_depends_on_subdirs( PUBLIC
                           Calorimeter/CaloDetDescr
                           Calorimeter/CaloGeoHelpers
                           Control/AthenaBaseComps
-                          Control/CLIDSvc
-                          Control/SGTools
+                          Control/AthenaKernel
                           DetectorDescription/GeoModel/GeoModelKernel
                           DetectorDescription/Identifier
                           GaudiKernel
@@ -35,7 +34,7 @@ atlas_add_component( LArDetDescr
                      src/*.cxx
                      src/components/*.cxx
                      INCLUDE_DIRS ${Boost_INCLUDE_DIRS} ${CORAL_INCLUDE_DIRS} ${CLHEP_INCLUDE_DIRS} ${EIGEN_INCLUDE_DIRS}
-                     LINK_LIBRARIES ${Boost_LIBRARIES} ${CORAL_LIBRARIES} ${CLHEP_LIBRARIES} ${EIGEN_LIBRARIES} CaloDetDescrLib CaloGeoHelpers AthenaBaseComps SGTools GeoModelKernel Identifier GaudiKernel LArReadoutGeometry CaloIdentifier StoreGateLib SGtests GeoModelUtilities GeoPrimitives )
+                     LINK_LIBRARIES ${Boost_LIBRARIES} ${CORAL_LIBRARIES} ${CLHEP_LIBRARIES} ${EIGEN_LIBRARIES} AthenaKernel CaloDetDescrLib CaloGeoHelpers AthenaBaseComps GeoModelKernel Identifier GaudiKernel LArReadoutGeometry CaloIdentifier StoreGateLib SGtests GeoModelUtilities GeoPrimitives )
 
 # Install files from the package:
 atlas_install_headers( LArDetDescr )

LArCalorimeter/LArDetDescr/LArDetDescr/LArCellVolumeDB.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 LARDETDESCR_LARCELLVOLUMEDB_H 
@@ -28,9 +28,7 @@ struct LArCellVolumeDB_t{
 
 typedef std::vector<LArCellVolumeDB_t> LArCellVolumeDB;
 
-#ifndef __CINT__
-#include "CLIDSvc/CLASS_DEF.h"
+#include "AthenaKernel/CLASS_DEF.h"
 CLASS_DEF(LArCellVolumeDB, 34482670 ,1)
-#endif
 
 #endif