From 67d15f0c3c937f5bf7280ba0d0a6cefd9faffc94 Mon Sep 17 00:00:00 2001
From: scott snyder <snyder@bnl.gov>
Date: Fri, 24 May 2019 16:47:45 +0200
Subject: [PATCH] IdDictDetDescrCnv: SGTools->AthenaKernel
Adjust for headers moved from SGTools to AthenaKernel.
Also remove unneeded references to CxxUtils.
---
.../IdDictDetDescrCnv/CMakeLists.txt | 5 ++---
.../IdDictDetDescrCnv/src/AtlasIDDetDescrCnv.cxx | 7 +++----
.../IdDictDetDescrCnv/src/IdDictDetDescrCnv.cxx | 16 ++--------------
3 files changed, 7 insertions(+), 21 deletions(-)
diff --git a/DetectorDescription/IdDictDetDescrCnv/CMakeLists.txt b/DetectorDescription/IdDictDetDescrCnv/CMakeLists.txt
index 7d4daeb7d386..2fa79980b6f7 100644
--- a/DetectorDescription/IdDictDetDescrCnv/CMakeLists.txt
+++ b/DetectorDescription/IdDictDetDescrCnv/CMakeLists.txt
@@ -8,8 +8,7 @@ atlas_subdir( IdDictDetDescrCnv )
# Declare the package's dependencies:
atlas_depends_on_subdirs( PRIVATE
Control/AthenaBaseComps
- Control/CxxUtils
- Control/SGTools
+ Control/AthenaKernel
Control/StoreGate
Database/RDBAccessSvc
DetectorDescription/AtlasDetDescr
@@ -29,7 +28,7 @@ find_package( CORAL COMPONENTS CoralBase CoralKernel RelationalAccess )
atlas_add_component( IdDictDetDescrCnv
src/*.cxx
INCLUDE_DIRS ${Boost_INCLUDE_DIRS} ${CORAL_INCLUDE_DIRS}
- LINK_LIBRARIES ${Boost_LIBRARIES} ${CORAL_LIBRARIES} AthenaBaseComps CxxUtils SGTools StoreGateLib SGtests AtlasDetDescr DetDescrCnvSvcLib GeoModelUtilities IdDictDetDescr IdDictParser Identifier GaudiKernel )
+ LINK_LIBRARIES ${Boost_LIBRARIES} ${CORAL_LIBRARIES} AthenaBaseComps AthenaKernel StoreGateLib SGtests AtlasDetDescr DetDescrCnvSvcLib GeoModelUtilities IdDictDetDescr IdDictParser Identifier GaudiKernel )
# Install files from the package:
atlas_install_headers( IdDictDetDescrCnv )
diff --git a/DetectorDescription/IdDictDetDescrCnv/src/AtlasIDDetDescrCnv.cxx b/DetectorDescription/IdDictDetDescrCnv/src/AtlasIDDetDescrCnv.cxx
index b4018679a99f..3478bbe27512 100755
--- a/DetectorDescription/IdDictDetDescrCnv/src/AtlasIDDetDescrCnv.cxx
+++ b/DetectorDescription/IdDictDetDescrCnv/src/AtlasIDDetDescrCnv.cxx
@@ -1,5 +1,5 @@
/*
- Copyright (C) 2002-2017 CERN for the benefit of the ATLAS collaboration
+ Copyright (C) 2002-2019 CERN for the benefit of the ATLAS collaboration
*/
/***************************************************************************
@@ -18,11 +18,10 @@
#include "DetDescrCnvSvc/DetDescrAddress.h"
#include "GaudiKernel/MsgStream.h"
#include "StoreGate/StoreGate.h"
-#include "SGTools/StorableConversions.h"
+#include "AthenaKernel/StorableConversions.h"
#include "IdDictDetDescr/IdDictManager.h"
#include "AtlasDetDescr/AtlasDetectorID.h"
-#include "CxxUtils/make_unique.h"
//<<<<<< PRIVATE DEFINES >>>>>>
//<<<<<< PRIVATE CONSTANTS >>>>>>
@@ -135,7 +134,7 @@ AtlasIDDetDescrCnv::createObj(IOpaqueAddress* pAddr, DataObject*& pObj)
// create the helper
- auto atlas_id = CxxUtils::make_unique<AtlasDetectorID>();
+ auto atlas_id = std::make_unique<AtlasDetectorID>();
atlas_id->setMessageSvc(msgSvc());
if (idDictMgr->initializeHelper(*atlas_id)) {
diff --git a/DetectorDescription/IdDictDetDescrCnv/src/IdDictDetDescrCnv.cxx b/DetectorDescription/IdDictDetDescrCnv/src/IdDictDetDescrCnv.cxx
index bd8f4d715325..2ea5b98b71ed 100755
--- a/DetectorDescription/IdDictDetDescrCnv/src/IdDictDetDescrCnv.cxx
+++ b/DetectorDescription/IdDictDetDescrCnv/src/IdDictDetDescrCnv.cxx
@@ -1,5 +1,5 @@
/*
- Copyright (C) 2002-2017 CERN for the benefit of the ATLAS collaboration
+ Copyright (C) 2002-2019 CERN for the benefit of the ATLAS collaboration
*/
/***************************************************************************
@@ -10,8 +10,6 @@
//<doc><file> $Id: IdDictDetDescrCnv.cxx,v 1.21 2009-02-15 13:08:19 schaffer Exp $
//<version> $Name: not supported by cvs2svn $
-//<<<<<< INCLUDES >>>>>>
-
#include "IdDictDetDescrCnv.h"
#include "IdDictParser/IdDictParser.h"
@@ -29,17 +27,7 @@
#include "GaudiKernel/MsgStream.h"
#include "StoreGate/StoreGate.h"
-#include "SGTools/StorableConversions.h"
-
-//<<<<<< PRIVATE DEFINES >>>>>>
-//<<<<<< PRIVATE CONSTANTS >>>>>>
-//<<<<<< PRIVATE TYPES >>>>>>
-//<<<<<< PRIVATE VARIABLE DEFINITIONS >>>>>>
-//<<<<<< PUBLIC VARIABLE DEFINITIONS >>>>>>
-//<<<<<< CLASS STRUCTURE INITIALIZATION >>>>>>
-//<<<<<< PRIVATE FUNCTION DEFINITIONS >>>>>>
-//<<<<<< PUBLIC FUNCTION DEFINITIONS >>>>>>
-//<<<<<< MEMBER FUNCTION DEFINITIONS >>>>>>
+#include "AthenaKernel/StorableConversions.h"
//--------------------------------------------------------------------
--
GitLab