Merge branch 'clidsvc.DataModelAthenaPool-20180927' into 'master'

DataModelAthenaPool: CLIDSvc -> AthenaKernel

See merge request atlas/athena!14545

Control/DataModelAthenaPool/CMakeLists.txt

@@ -17,7 +17,6 @@ atlas_depends_on_subdirs( PUBLIC
                           GaudiKernel
                           PRIVATE
                           AtlasTest/TestTools
-                          Control/CLIDSvc
                           Control/SGTools
                           Database/AthenaPOOL/AthenaPoolUtilities
                           Database/AthenaPOOL/RootConversions )

Control/DataModelAthenaPool/test/DataLink_p2_test.cxx

@@ -15,7 +15,7 @@
 #undef NDEBUG
 #include "AthLinks/DataLink.h"
 #include "DataModelAthenaPool/DataLinkCnv_p2.h"
-#include "CLIDSvc/CLASS_DEF.h"
+#include "AthenaKernel/CLASS_DEF.h"
 #include <vector>
 #include <cassert>
 #include <iostream>

Control/DataModelAthenaPool/test/ElementLinkCnv_p1_test.cxx

@@ -16,7 +16,7 @@
 #undef NDEBUG
 #include "AthLinks/ElementLink.h"
 #include "DataModelAthenaPool/ElementLinkCnv_p1.h"
-#include "CLIDSvc/CLASS_DEF.h"
+#include "AthenaKernel/CLASS_DEF.h"
 #include <vector>
 #include <cassert>
 #include <iostream>

Control/DataModelAthenaPool/test/ElementLinkCnv_p2_test.cxx

@@ -16,7 +16,7 @@
 #undef NDEBUG
 #include "AthLinks/ElementLink.h"
 #include "DataModelAthenaPool/ElementLinkCnv_p2.h"
-#include "CLIDSvc/CLASS_DEF.h"
+#include "AthenaKernel/CLASS_DEF.h"
 #include <vector>
 #include <cassert>
 #include <iostream>

Control/DataModelAthenaPool/test/ElementLinkCnv_p3_test.cxx

@@ -16,7 +16,7 @@
 #undef NDEBUG
 #include "AthLinks/ElementLink.h"
 #include "DataModelAthenaPool/ElementLinkCnv_p3.h"
-#include "CLIDSvc/CLASS_DEF.h"
+#include "AthenaKernel/CLASS_DEF.h"
 #include <vector>
 #include <cassert>
 #include <iostream>

Control/DataModelAthenaPool/test/ElementLinkVectorCnv_p1_test.cxx

@@ -16,7 +16,7 @@
 #undef NDEBUG
 #include "AthLinks/ElementLinkVector.h"
 #include "DataModelAthenaPool/ElementLinkVectorCnv_p1.h"
-#include "CLIDSvc/CLASS_DEF.h"
+#include "AthenaKernel/CLASS_DEF.h"
 #include <vector>
 #include <cassert>
 #include <iostream>

Control/DataModelAthenaPool/test/NavigableCnv_p1_test.cxx

@@ -18,7 +18,7 @@
 #include "Navigation/NavigableTerminalNode.h"
 #include "DataModelAthenaPool/NavigableCnv_p1.h"
 #include "AthContainers/DataVector.h"
-#include "CLIDSvc/CLASS_DEF.h"
+#include "AthenaKernel/CLASS_DEF.h"
 #include <vector>
 #include <cassert>
 #include <iostream>

Control/DataModelAthenaPool/test/NavigableCnv_p2_test.cxx

@@ -18,7 +18,7 @@
 #include "Navigation/NavigableTerminalNode.h"
 #include "DataModelAthenaPool/NavigableCnv_p2.h"
 #include "AthContainers/DataVector.h"
-#include "CLIDSvc/CLASS_DEF.h"
+#include "AthenaKernel/CLASS_DEF.h"
 #include <vector>
 #include <cassert>
 #include <iostream>

Control/DataModelAthenaPool/test/NavigableVectorCnv_p1_test.cxx

@@ -18,7 +18,7 @@
 #include "Navigation/NavigableTerminalNode.h"
 #include "DataModelAthenaPool/NavigableVectorCnv_p1.h"
 #include "AthContainers/DataVector.h"
-#include "CLIDSvc/CLASS_DEF.h"
+#include "AthenaKernel/CLASS_DEF.h"
 #include <vector>
 #include <cassert>
 #include <iostream>

Control/DataModelAthenaPool/test/NavigableVectorCnv_p2_test.cxx

@@ -18,7 +18,7 @@
 #include "Navigation/NavigableTerminalNode.h"
 #include "DataModelAthenaPool/NavigableVectorCnv_p2.h"
 #include "AthContainers/DataVector.h"
-#include "CLIDSvc/CLASS_DEF.h"
+#include "AthenaKernel/CLASS_DEF.h"
 #include <vector>
 #include <cassert>
 #include <iostream>