From cc1f3d5b2299ba7f5513ff48d7a1da1963018bc8 Mon Sep 17 00:00:00 2001
From: scott snyder <scott.snyder@cern.ch>
Date: Thu, 22 Mar 2018 14:20:06 +0100
Subject: [PATCH] DBDataModel: DataModel -> AthContainers.
Remove reference to obsolete package DataModel.
Adjust references to headers moved to AthenaKernel.
---
Database/AthenaPOOL/DBDataModel/CMakeLists.txt | 9 ++++-----
.../DBDataModel/DBDataModel/CollectionMetadata.h | 4 ++--
2 files changed, 6 insertions(+), 7 deletions(-)
diff --git a/Database/AthenaPOOL/DBDataModel/CMakeLists.txt b/Database/AthenaPOOL/DBDataModel/CMakeLists.txt
index f66f3c824b6..3507c4fdf71 100644
--- a/Database/AthenaPOOL/DBDataModel/CMakeLists.txt
+++ b/Database/AthenaPOOL/DBDataModel/CMakeLists.txt
@@ -7,9 +7,8 @@ atlas_subdir( DBDataModel )
# Declare the package's dependencies:
atlas_depends_on_subdirs( PUBLIC
- Control/CLIDSvc
- Control/DataModel
- Control/SGTools
+ Control/AthenaKernel
+ Control/AthContainers
PRIVATE
Database/APR/CollectionBase )
@@ -21,12 +20,12 @@ atlas_add_library( DBDataModel
src/*.cxx
PUBLIC_HEADERS DBDataModel
PRIVATE_INCLUDE_DIRS ${ROOT_INCLUDE_DIRS}
- LINK_LIBRARIES DataModel SGTools
+ LINK_LIBRARIES AthContainers
PRIVATE_LINK_LIBRARIES ${ROOT_LIBRARIES} CollectionBase )
atlas_add_dictionary( DBDataModelDict
DBDataModel/DBDataModelDict.h
DBDataModel/selection.xml
INCLUDE_DIRS ${ROOT_INCLUDE_DIRS}
- LINK_LIBRARIES ${ROOT_LIBRARIES} DataModel SGTools CollectionBase DBDataModel )
+ LINK_LIBRARIES ${ROOT_LIBRARIES} AthContainers CollectionBase DBDataModel )
diff --git a/Database/AthenaPOOL/DBDataModel/DBDataModel/CollectionMetadata.h b/Database/AthenaPOOL/DBDataModel/DBDataModel/CollectionMetadata.h
index 98d92d254fb..5db99805f65 100644
--- a/Database/AthenaPOOL/DBDataModel/DBDataModel/CollectionMetadata.h
+++ b/Database/AthenaPOOL/DBDataModel/DBDataModel/CollectionMetadata.h
@@ -10,7 +10,7 @@
* @author Peter van Gemmeren <gemmeren@anl.gov>
**/
-#include "DataModel/DataVector.h"
+#include "AthContainers/DataVector.h"
#include <string>
#include <map>
@@ -32,7 +32,7 @@ public: // Constructor and Destructor
typedef DataVector<CollectionMetadata> CollectionMetadataContainer;
-#include "CLIDSvc/CLASS_DEF.h"
+#include "AthenaKernel/CLASS_DEF.h"
CLASS_DEF(CollectionMetadata, 1253814833, 1)
CLASS_DEF(CollectionMetadataContainer, 1296887519, 1)
#endif
--
GitLab