From ff84d3c1a97ff7db62c860c328efc554d3e64a61 Mon Sep 17 00:00:00 2001
From: scott snyder <snyder@bnl.gov>
Date: Fri, 28 Sep 2018 15:01:28 +0200
Subject: [PATCH] GeoModelInterfaces: CLIDSvc -> AthenaKernel
Remove references to obsolete package CLIDSvc; header moved to AthenaKernel.
Also remove unneeded dependency on SGTools.
---
.../GeoModel/GeoModelInterfaces/CMakeLists.txt | 2 --
.../GeoModelInterfaces/StoredMaterialManager.h | 6 +++---
2 files changed, 3 insertions(+), 5 deletions(-)
diff --git a/DetectorDescription/GeoModel/GeoModelInterfaces/CMakeLists.txt b/DetectorDescription/GeoModel/GeoModelInterfaces/CMakeLists.txt
index fa5a15f10bc..9240ff541a9 100644
--- a/DetectorDescription/GeoModel/GeoModelInterfaces/CMakeLists.txt
+++ b/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:
diff --git a/DetectorDescription/GeoModel/GeoModelInterfaces/GeoModelInterfaces/StoredMaterialManager.h b/DetectorDescription/GeoModel/GeoModelInterfaces/GeoModelInterfaces/StoredMaterialManager.h
index 949484f24bd..f988dacd2aa 100755
--- a/DetectorDescription/GeoModel/GeoModelInterfaces/GeoModelInterfaces/StoredMaterialManager.h
+++ b/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
{
--
GitLab