From ea4b6da489e5459276449a869c58529932aa3e46 Mon Sep 17 00:00:00 2001
From: scott snyder <snyder@bnl.gov>
Date: Fri, 7 Dec 2018 16:39:38 +0100
Subject: [PATCH] AthenaRootCompse: SGTools -> AthenaKernel

Adjust for headers moved from SGTools to AthenaKernel.
---
 .../AthenaRootComps/AthenaRootComps/TransferTree.h          | 4 ++--
 Database/AthenaRoot/AthenaRootComps/src/LeafCnv.cxx         | 6 ++----
 Database/AthenaRoot/AthenaRootComps/src/RootCnv.cxx         | 5 ++---
 .../AthenaRoot/AthenaRootComps/src/RootDataBucketBranch.h   | 3 +--
 .../AthenaRootComps/src/RootNtupleEventSelector.cxx         | 4 ++--
 .../AthenaRootComps/src/RootNtupleOutputMetadataTool.cxx    | 4 ++--
 .../AthenaRoot/AthenaRootComps/src/RootOutputStreamTool.h   | 4 ++--
 .../AthenaRoot/AthenaRootComps/src/xAODBranchAddress.cxx    | 4 ++--
 Database/AthenaRoot/AthenaRootComps/src/xAODCnv.cxx         | 6 ++----
 .../AthenaRoot/AthenaRootComps/src/xAODEventSelector.cxx    | 6 +++---
 10 files changed, 20 insertions(+), 26 deletions(-)

diff --git a/Database/AthenaRoot/AthenaRootComps/AthenaRootComps/TransferTree.h b/Database/AthenaRoot/AthenaRootComps/AthenaRootComps/TransferTree.h
index 9ee7084d71f..f6b7f0398f2 100644
--- a/Database/AthenaRoot/AthenaRootComps/AthenaRootComps/TransferTree.h
+++ b/Database/AthenaRoot/AthenaRootComps/AthenaRootComps/TransferTree.h
@@ -1,11 +1,11 @@
 /*
-  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 TRANSFERTREE_H
 #define TRANSFERTREE_H
 #include "TTree.h"
-#include "SGTools/CLASS_DEF.h"
+#include "AthenaKernel/CLASS_DEF.h"
 
 class TransferTree
 {
diff --git a/Database/AthenaRoot/AthenaRootComps/src/LeafCnv.cxx b/Database/AthenaRoot/AthenaRootComps/src/LeafCnv.cxx
index 995afcdd8e6..31b3a984cdb 100644
--- a/Database/AthenaRoot/AthenaRootComps/src/LeafCnv.cxx
+++ b/Database/AthenaRoot/AthenaRootComps/src/LeafCnv.cxx
@@ -1,7 +1,7 @@
 ///////////////////////// -*- C++ -*- /////////////////////////////
 
 /*
-  Copyright (C) 2002-2017 CERN for the benefit of the ATLAS collaboration
+  Copyright (C) 2002-2018 CERN for the benefit of the ATLAS collaboration
 */
 
 // LeafCnv.cxx 
@@ -25,9 +25,7 @@
 #include "GaudiKernel/ServiceHandle.h"
 #include "GaudiKernel/System.h"
 #include "AthenaKernel/IDictLoaderSvc.h"
-
-// sgtools
-#include "SGTools/DataBucketBase.h"
+#include "AthenaKernel/DataBucketBase.h"
 
 // ROOT 
 #include "TBranch.h"
diff --git a/Database/AthenaRoot/AthenaRootComps/src/RootCnv.cxx b/Database/AthenaRoot/AthenaRootComps/src/RootCnv.cxx
index 5811f5ee685..a07379a709e 100755
--- a/Database/AthenaRoot/AthenaRootComps/src/RootCnv.cxx
+++ b/Database/AthenaRoot/AthenaRootComps/src/RootCnv.cxx
@@ -1,7 +1,7 @@
 ///////////////////////// -*- C++ -*- /////////////////////////////
 
 /*
-  Copyright (C) 2002-2017 CERN for the benefit of the ATLAS collaboration
+  Copyright (C) 2002-2018 CERN for the benefit of the ATLAS collaboration
 */
 
 // RootCnv.cxx
@@ -25,12 +25,11 @@
 #include "GaudiKernel/IOpaqueAddress.h"
 #include "GaudiKernel/IRegistry.h"
 #include "AthenaKernel/ITPCnvBase.h"
+#include "AthenaKernel/StorableConversions.h"
 #include "AthenaBaseComps/AthCheckMacros.h"
 #include "PersistentDataModel/Placement.h"
 #include "PersistentDataModel/Token.h"
 
-// sgtools
-#include "SGTools/StorableConversions.h"
 
 namespace {
   std::string name_from_clid(const CLID clid) {
diff --git a/Database/AthenaRoot/AthenaRootComps/src/RootDataBucketBranch.h b/Database/AthenaRoot/AthenaRootComps/src/RootDataBucketBranch.h
index c7ff1c8de3b..e99ee1d9435 100644
--- a/Database/AthenaRoot/AthenaRootComps/src/RootDataBucketBranch.h
+++ b/Database/AthenaRoot/AthenaRootComps/src/RootDataBucketBranch.h
@@ -15,8 +15,7 @@
 #include <string>
 #include <stdexcept>
 
-// SGTools
-#include "SGTools/DataBucketBase.h"
+#include "AthenaKernel/DataBucketBase.h"
 
 #include "DataModelRoot/RootType.h"
 
diff --git a/Database/AthenaRoot/AthenaRootComps/src/RootNtupleEventSelector.cxx b/Database/AthenaRoot/AthenaRootComps/src/RootNtupleEventSelector.cxx
index c5db0b2acbc..697fa131978 100644
--- a/Database/AthenaRoot/AthenaRootComps/src/RootNtupleEventSelector.cxx
+++ b/Database/AthenaRoot/AthenaRootComps/src/RootNtupleEventSelector.cxx
@@ -1,7 +1,7 @@
 ///////////////////////// -*- C++ -*- /////////////////////////////
 
 /*
-  Copyright (C) 2002-2017 CERN for the benefit of the ATLAS collaboration
+  Copyright (C) 2002-2018 CERN for the benefit of the ATLAS collaboration
 */
 
 // RootNtupleEventSelector.cxx 
@@ -37,11 +37,11 @@
 #include "GaudiKernel/System.h"
 #include "AthenaKernel/IClassIDSvc.h"
 #include "AthenaKernel/IDictLoaderSvc.h"
+#include "AthenaKernel/CLASS_DEF.h"
 
 // StoreGate includes
 
 #include "SGTools/BuiltinsClids.h"   // to make sure we have their clids
-#include "SGTools/CLASS_DEF.h"
 #include "SGTools/StlMapClids.h"     // to make sure we have their clids
 #include "SGTools/StlVectorClids.h"  // to make sure we have their clids
 #include "SGTools/TransientAddress.h"
diff --git a/Database/AthenaRoot/AthenaRootComps/src/RootNtupleOutputMetadataTool.cxx b/Database/AthenaRoot/AthenaRootComps/src/RootNtupleOutputMetadataTool.cxx
index f5f55440818..d2baa4b17ae 100755
--- a/Database/AthenaRoot/AthenaRootComps/src/RootNtupleOutputMetadataTool.cxx
+++ b/Database/AthenaRoot/AthenaRootComps/src/RootNtupleOutputMetadataTool.cxx
@@ -1,7 +1,7 @@
 ///////////////////////// -*- C++ -*- /////////////////////////////
 
 /*
-  Copyright (C) 2002-2017 CERN for the benefit of the ATLAS collaboration
+  Copyright (C) 2002-2018 CERN for the benefit of the ATLAS collaboration
 */
 
 // RootNtupleOutputMetadataTool.cxx 
@@ -22,10 +22,10 @@
 
 // Athena
 #include "AthenaKernel/IClassIDSvc.h"
+#include "AthenaKernel/CLASS_DEF.h"
 #include "AthenaRootKernel/IIoSvc.h"
 #include "StoreGate/StoreGateSvc.h"
 #include "SGTools/BuiltinsClids.h"
-#include "SGTools/CLASS_DEF.h"
 
 #include "TString.h"
 #include "AthenaRootComps/TransferTree.h"
diff --git a/Database/AthenaRoot/AthenaRootComps/src/RootOutputStreamTool.h b/Database/AthenaRoot/AthenaRootComps/src/RootOutputStreamTool.h
index 6c945a95c2b..45c2d2bfd9d 100755
--- a/Database/AthenaRoot/AthenaRootComps/src/RootOutputStreamTool.h
+++ b/Database/AthenaRoot/AthenaRootComps/src/RootOutputStreamTool.h
@@ -1,7 +1,7 @@
 ///////////////////////// -*- C++ -*- /////////////////////////////
 
 /*
-  Copyright (C) 2002-2017 CERN for the benefit of the ATLAS collaboration
+  Copyright (C) 2002-2018 CERN for the benefit of the ATLAS collaboration
 */
 
 // RootOutputStreamTool.h
@@ -67,7 +67,7 @@ public:
 
   /// Stream out a vector of objects
   ///   Must convert to DataObject, e.g.
-  ///   #include "SGTools/StorableConversions.h"
+  ///   #include "AthenaKernel/StorableConversions.h"
   ///     T* obj = xxx;
   ///     DataObject* dataObject = SG::asStorable(obj);
   StatusCode streamObjects(const IAthenaOutputStreamTool::DataObjectVec& dataObjects);
diff --git a/Database/AthenaRoot/AthenaRootComps/src/xAODBranchAddress.cxx b/Database/AthenaRoot/AthenaRootComps/src/xAODBranchAddress.cxx
index 40055b19bb2..da155b4d555 100644
--- a/Database/AthenaRoot/AthenaRootComps/src/xAODBranchAddress.cxx
+++ b/Database/AthenaRoot/AthenaRootComps/src/xAODBranchAddress.cxx
@@ -1,7 +1,7 @@
 ///////////////////////// -*- C++ -*- /////////////////////////////
 
 /*
-  Copyright (C) 2002-2017 CERN for the benefit of the ATLAS collaboration
+  Copyright (C) 2002-2018 CERN for the benefit of the ATLAS collaboration
 */
 
 // xAODBranchAddress.cxx 
@@ -18,7 +18,7 @@
 // fwk includes
 #include "GaudiKernel/System.h"
 //#include "GaudiKernel/ClassID.h"
-#include "SGTools/CLIDRegistry.h"
+#include "AthenaKernel/CLIDRegistry.h"
 
 // ROOT includes
 #include "TBranch.h"
diff --git a/Database/AthenaRoot/AthenaRootComps/src/xAODCnv.cxx b/Database/AthenaRoot/AthenaRootComps/src/xAODCnv.cxx
index 0de4f9ec7b0..41b678e8022 100644
--- a/Database/AthenaRoot/AthenaRootComps/src/xAODCnv.cxx
+++ b/Database/AthenaRoot/AthenaRootComps/src/xAODCnv.cxx
@@ -1,7 +1,7 @@
 ///////////////////////// -*- C++ -*- /////////////////////////////
 
 /*
-  Copyright (C) 2002-2017 CERN for the benefit of the ATLAS collaboration
+  Copyright (C) 2002-2018 CERN for the benefit of the ATLAS collaboration
 */
 
 // xAODCnv.cxx 
@@ -25,9 +25,7 @@
 #include "GaudiKernel/ServiceHandle.h"
 #include "GaudiKernel/System.h"
 #include "AthenaKernel/IDictLoaderSvc.h"
-
-// sgtools
-#include "SGTools/DataBucketBase.h"
+#include "AthenaKernel/DataBucketBase.h"
 
 // ROOT 
 #include "TBranch.h"
diff --git a/Database/AthenaRoot/AthenaRootComps/src/xAODEventSelector.cxx b/Database/AthenaRoot/AthenaRootComps/src/xAODEventSelector.cxx
index 3af4cacfd91..971c34e81f3 100644
--- a/Database/AthenaRoot/AthenaRootComps/src/xAODEventSelector.cxx
+++ b/Database/AthenaRoot/AthenaRootComps/src/xAODEventSelector.cxx
@@ -1,7 +1,7 @@
 ///////////////////////// -*- C++ -*- /////////////////////////////
 
 /*
-  Copyright (C) 2002-2017 CERN for the benefit of the ATLAS collaboration
+  Copyright (C) 2002-2018 CERN for the benefit of the ATLAS collaboration
 */
 
 // xAODEventSelector.cxx 
@@ -38,16 +38,16 @@
 #include "GaudiKernel/System.h"
 #include "AthenaKernel/IClassIDSvc.h"
 #include "AthenaKernel/IDictLoaderSvc.h"
+#include "AthenaKernel/CLASS_DEF.h"
+#include "AthenaKernel/CLIDRegistry.h"
 
 // StoreGate includes
 
 #include "SGTools/BuiltinsClids.h"   // to make sure we have their clids
-#include "SGTools/CLASS_DEF.h"
 #include "SGTools/StlMapClids.h"     // to make sure we have their clids
 #include "SGTools/StlVectorClids.h"  // to make sure we have their clids
 #include "SGTools/TransientAddress.h"
 #include "StoreGate/StoreGate.h" 
-#include "SGTools/CLIDRegistry.h"
 
 // EventInfo includes
 #include "EventInfo/EventInfo.h"
-- 
GitLab