GeoModelEnvelopes: Remove references to obsolete package CLIDSvc.

Headers from CLIDSvc have been moved to AthenaKernel.



Former-commit-id: 5d76402a28b18212a5d461351664b7889c0f285f

AtlasGeometryCommon/GeoModelEnvelopes/CMakeLists.txt

@@ -7,7 +7,7 @@ atlas_subdir( GeoModelEnvelopes )
 
 # Declare the package's dependencies:
 atlas_depends_on_subdirs( PUBLIC
-                          Control/CLIDSvc
+                          Control/AthenaKernel
                           DetectorDescription/GeoModel/GeoModelKernel
                           DetectorDescription/GeoModel/GeoModelUtilities
                           PRIVATE

AtlasGeometryCommon/GeoModelEnvelopes/GeoModelEnvelopes/ForDetEnvelopeManager.h

@@ -39,7 +39,7 @@ class ForDetEnvelopeManager : public GeoVDetectorManager
 };
 
 #ifndef GAUDI_NEUTRAL
-#include "CLIDSvc/CLASS_DEF.h"
+#include "AthenaKernel/CLASS_DEF.h"
 CLASS_DEF(ForDetEnvelopeManager, 238515740, 1)
 #endif
 

AtlasGeometryCommon/GeoModelEnvelopes/src/ForDetEnvelopeTool.cxx

@@ -9,7 +9,7 @@
 
 #include "StoreGate/StoreGateSvc.h"
 
-#include "CLIDSvc/tools/ClassID_traits.h"
+#include "AthenaKernel/ClassID_traits.h"
 #include "SGTools/DataProxy.h"
 
 ForDetEnvelopeTool::ForDetEnvelopeTool(const std::string& type, 
@@ -57,9 +57,9 @@ StatusCode ForDetEnvelopeTool::create()
 
 StatusCode ForDetEnvelopeTool::clear()
 {
-  SG::DataProxy* _proxy = detStore()->proxy(ClassID_traits<ForDetEnvelopeManager>::ID(),m_manager->getName());
-  if(_proxy) {
-    _proxy->reset();
+  SG::DataProxy* proxy = detStore()->proxy(ClassID_traits<ForDetEnvelopeManager>::ID(),m_manager->getName());
+  if(proxy) {
+    proxy->reset();
     m_manager = 0;
   }
   return StatusCode::SUCCESS;