GeoModelInterfaces: CLIDSvc -> AthenaKernel

Remove references to obsolete package CLIDSvc; header moved to AthenaKernel.
Also remove unneeded dependency on SGTools.



Former-commit-id: ff84d3c1

DetectorDescription/GeoModel/GeoModelInterfaces/CMakeLists.txt

@@ -8,8 +8,6 @@ atlas_subdir( GeoModelInterfaces )
 # Declare the package's dependencies:
 atlas_depends_on_subdirs( PUBLIC
                           Control/AthenaKernel
-                          Control/CLIDSvc
-                          Control/SGTools
                           GaudiKernel )
 
 # Install files from the package:

DetectorDescription/GeoModel/GeoModelInterfaces/GeoModelInterfaces/StoredMaterialManager.h

@@ -2,8 +2,8 @@
   Copyright (C) 2002-2017 CERN for the benefit of the ATLAS collaboration
 */
 
-#ifndef _STOREDMATERIALMANAGER_H_
-#define _STOREDMATERIALMANAGER_H_
+#ifndef GEOMODELINTERFACES_STOREDMATERIALMANAGER_H
+#define GEOMODELINTERFACES_STOREDMATERIALMANAGER_H
 //---------------------------------------------------------//
 //                                                         //
 // class StoredMaterialManager  This class hold one or more//
@@ -14,7 +14,7 @@
 //                                                         //
 //---------------------------------------------------------//
 #include "GeoModelInterfaces/AbsMaterialManager.h"
-#include "CLIDSvc/CLASS_DEF.h"
+#include "AthenaKernel/CLASS_DEF.h"
 #include <map>
 class StoredMaterialManager:public AbsMaterialManager 
 {