Merge branch 'sgtools.McEventSelector-20190525' into 'master'

McEventSelector: SGTools->AthenaKernel

See merge request atlas/athena!23711

Generators/McEventSelector/CMakeLists.txt

@@ -11,7 +11,6 @@ atlas_depends_on_subdirs( PUBLIC
                           Control/AthenaKernel
                           GaudiKernel
                           PRIVATE
-                          Control/SGTools
                           Event/EventInfo )
 
 # Component(s) in the package:
@@ -21,7 +20,7 @@ atlas_add_component( McEventSelector
                      src/McEventCnv.cxx
                      src/McCnvSvc.cxx
                      src/McEventSelector_entries.cxx
-                     LINK_LIBRARIES AthenaBaseComps AthenaKernel GaudiKernel SGTools EventInfo )
+                     LINK_LIBRARIES AthenaBaseComps AthenaKernel GaudiKernel EventInfo )
 
 # Install files from the package:
 atlas_install_headers( McEventSelector )

Generators/McEventSelector/src/McEventCnv.cxx

 /*
-  Copyright (C) 2002-2017 CERN for the benefit of the ATLAS collaboration
+  Copyright (C) 2002-2019 CERN for the benefit of the ATLAS collaboration
 */
 
 #include "McEventSelector/McEventCnv.h"
 
 #include "GaudiKernel/StatusCode.h"
-#include "SGTools/StorableConversions.h"
+#include "AthenaKernel/StorableConversions.h"
 #include "McEventSelector/McAddress.h"
 #include "McEventSelector/McCnvSvc.h"
 #include "EventInfo/EventInfo.h"