Merge branch 'sgtools.IOVSvc-20181210' into 'master'

IOVSvc: SGTools -> AthenaKernel

See merge request atlas/athena!16603

Former-commit-id: 5bf6a862

Control/IOVSvc/src/CondInputLoader.cxx

@@ -23,7 +23,7 @@
 #include "AthenaKernel/CondContMaker.h"
 
 #include "xAODEventInfo/EventInfo.h"
-#include "SGTools/BaseInfo.h"
+#include "AthenaKernel/BaseInfo.h"
 
 #include "TClass.h"
 

Control/IOVSvc/src/CondSvc.cxx

 /*
-  Copyright (C) 2002-2017 CERN for the benefit of the ATLAS collaboration
+  Copyright (C) 2002-2018 CERN for the benefit of the ATLAS collaboration
 */
 #include "IOVSvc/CondSvc.h"
 #include "AthenaKernel/CondCont.h"
 #include "GaudiKernel/EventIDBase.h"
 #include "AthenaKernel/StoreID.h"
-#include "SGTools/BaseInfo.h"
+#include "AthenaKernel/BaseInfo.h"
 
 
 //---------------------------------------------------------------------------

Control/IOVSvc/test/IOVSvcTool_test.cxx

 /*
-  Copyright (C) 2002-2017 CERN for the benefit of the ATLAS collaboration
+  Copyright (C) 2002-2018 CERN for the benefit of the ATLAS collaboration
 */
 
 #undef NDEBUG
@@ -12,7 +12,7 @@
 #include <cassert>
 #include <iostream>
 
-#include "SGTools/CLASS_DEF.h"
+#include "AthenaKernel/CLASS_DEF.h"
 #include "SGTools/DataProxy.h"
 #include "SGTools/TransientAddress.h"
 using namespace SG;