From 8850e7c764f5c50cd7a8ca4eaa75ebf371d2eaa7 Mon Sep 17 00:00:00 2001
From: scott snyder <scott.snyder@cern.ch>
Date: Thu, 22 Mar 2018 14:20:22 +0100
Subject: [PATCH] ByteStreamData: DataModel -> AthContainers.
Remove reference to obsolete package DataModel.
Adjust references to headers moved to AthenaKernel.
---
Event/ByteStreamData/ByteStreamData/ByteStream.h | 2 +-
Event/ByteStreamData/ByteStreamData/ByteStreamMetadata.h | 2 +-
.../ByteStreamData/ByteStreamMetadataContainer.h | 4 ++--
.../ByteStreamData/ByteStreamData/ByteStreamUserMetadata.h | 2 +-
Event/ByteStreamData/CMakeLists.txt | 7 +++----
5 files changed, 8 insertions(+), 9 deletions(-)
diff --git a/Event/ByteStreamData/ByteStreamData/ByteStream.h b/Event/ByteStreamData/ByteStreamData/ByteStream.h
index f36f9ae6e6c..1b29b77a5f5 100644
--- a/Event/ByteStreamData/ByteStreamData/ByteStream.h
+++ b/Event/ByteStreamData/ByteStreamData/ByteStream.h
@@ -41,6 +41,6 @@ private:
OFFLINE_FRAGMENTS_NAMESPACE::DataType* m_start;
};
-#include "CLIDSvc/CLASS_DEF.h"
+#include "AthenaKernel/CLASS_DEF.h"
CLASS_DEF(ByteStream, 7001, 1)
#endif
diff --git a/Event/ByteStreamData/ByteStreamData/ByteStreamMetadata.h b/Event/ByteStreamData/ByteStreamData/ByteStreamMetadata.h
index a003e94ec75..15f6a5d43a2 100644
--- a/Event/ByteStreamData/ByteStreamData/ByteStreamMetadata.h
+++ b/Event/ByteStreamData/ByteStreamData/ByteStreamMetadata.h
@@ -84,6 +84,6 @@ private:
std::vector<std::string> m_freeMetaDataStrings;
};
-#include "CLIDSvc/CLASS_DEF.h"
+#include "AthenaKernel/CLASS_DEF.h"
CLASS_DEF(ByteStreamMetadata, 170625359, 1)
#endif
diff --git a/Event/ByteStreamData/ByteStreamData/ByteStreamMetadataContainer.h b/Event/ByteStreamData/ByteStreamData/ByteStreamMetadataContainer.h
index 4209524d2f9..2f6b5f2cbc1 100644
--- a/Event/ByteStreamData/ByteStreamData/ByteStreamMetadataContainer.h
+++ b/Event/ByteStreamData/ByteStreamData/ByteStreamMetadataContainer.h
@@ -12,7 +12,7 @@
**/
#include "ByteStreamData/ByteStreamMetadata.h"
-#include "DataModel/DataVector.h"
+#include "AthContainers/DataVector.h"
/** @class ByteStreamMetadataContainer
* @brief This class is the StoreGate data object for bytestream metadata.
@@ -20,6 +20,6 @@
class ByteStreamMetadataContainer : public DataVector<ByteStreamMetadata> {
};
-#include "CLIDSvc/CLASS_DEF.h"
+#include "AthenaKernel/CLASS_DEF.h"
CLASS_DEF(ByteStreamMetadataContainer, 1076128893, 1)
#endif
diff --git a/Event/ByteStreamData/ByteStreamData/ByteStreamUserMetadata.h b/Event/ByteStreamData/ByteStreamData/ByteStreamUserMetadata.h
index b4ed0509e81..896ed4ffaad 100644
--- a/Event/ByteStreamData/ByteStreamData/ByteStreamUserMetadata.h
+++ b/Event/ByteStreamData/ByteStreamData/ByteStreamUserMetadata.h
@@ -22,7 +22,7 @@
#include <sstream>
#include <map>
#include <string>
-#include "CLIDSvc/CLASS_DEF.h"
+#include "AthenaKernel/CLASS_DEF.h"
class ByteStreamFreeMetadataString : public std::pair<std::string,std::string>
{
diff --git a/Event/ByteStreamData/CMakeLists.txt b/Event/ByteStreamData/CMakeLists.txt
index 851553d77be..3ea4216c32b 100644
--- a/Event/ByteStreamData/CMakeLists.txt
+++ b/Event/ByteStreamData/CMakeLists.txt
@@ -9,9 +9,8 @@ atlas_subdir( ByteStreamData )
# Declare the package's dependencies:
atlas_depends_on_subdirs(
PUBLIC
- Control/CLIDSvc
- Control/DataModel
- Control/SGTools )
+ Control/AthenaKernel
+ Control/AthContainers )
# External dependencies:
find_package( tdaq-common )
@@ -31,7 +30,7 @@ atlas_add_library( ByteStreamData
src/ByteStreamMetadata.cxx
PUBLIC_HEADERS ByteStreamData
${extra_inc}
- LINK_LIBRARIES DataModel SGTools ${extra_lib} )
+ LINK_LIBRARIES AthContainers ${extra_lib} )
atlas_add_library( ByteStreamData_test
src/ROBData_t.cxx
--
GitLab