From 2ddcd72997421377ff41d98b14d9f181bc10d297 Mon Sep 17 00:00:00 2001
From: scott snyder <sss@karma>
Date: Fri, 9 Oct 2020 15:05:18 -0400
Subject: [PATCH] ByteStreamCnvSvcBase: Remove m_rawEventWrite.
Remove the RawEvent pointer from ByteStreamCnvSvcBase; moving it to
ByteStreamCnvSvc as part of thread-safety work.
ByteStreamCnvSvcBase then becomes an abstract class, so remove it
from the entries file.
---
.../ByteStreamCnvSvcBase/ByteStreamCnvSvcBase.h | 7 +------
Event/ByteStreamCnvSvcBase/src/ByteStreamCnvSvcBase.cxx | 6 +++---
.../src/components/ByteStreamCnvSvcBase_entries.cxx | 2 --
3 files changed, 4 insertions(+), 11 deletions(-)
diff --git a/Event/ByteStreamCnvSvcBase/ByteStreamCnvSvcBase/ByteStreamCnvSvcBase.h b/Event/ByteStreamCnvSvcBase/ByteStreamCnvSvcBase/ByteStreamCnvSvcBase.h
index eb20d2b92ea..d05293b3399 100755
--- a/Event/ByteStreamCnvSvcBase/ByteStreamCnvSvcBase/ByteStreamCnvSvcBase.h
+++ b/Event/ByteStreamCnvSvcBase/ByteStreamCnvSvcBase/ByteStreamCnvSvcBase.h
@@ -1,5 +1,5 @@
/*
- Copyright (C) 2002-2019 CERN for the benefit of the ATLAS collaboration
+ Copyright (C) 2002-2020 CERN for the benefit of the ATLAS collaboration
*/
#ifndef BYTESTREAMCNVSVCBASE_BYTESTREAMCNVSVCBASE_H
@@ -37,15 +37,10 @@ public:
/// Checks whether an IOpaqueAddress is a GenericAddress
virtual StatusCode updateServiceState(IOpaqueAddress* pAddress) override;
- /// Implementation of IByteStreamEventAccess: Get RawEvent
- virtual RawEventWrite* getRawEvent() override { return m_rawEventWrite; }
-
/// Implementation of IIncidentListener: Handle for EndEvent incidence
virtual void handle(const Incident&) override;
protected: // data
- RawEventWrite* m_rawEventWrite;
-
std::vector<std::string> m_initCnvs;
std::vector<std::string> m_ROD2ROBmap;
};
diff --git a/Event/ByteStreamCnvSvcBase/src/ByteStreamCnvSvcBase.cxx b/Event/ByteStreamCnvSvcBase/src/ByteStreamCnvSvcBase.cxx
index c231f5d8535..cadfc55bfa2 100755
--- a/Event/ByteStreamCnvSvcBase/src/ByteStreamCnvSvcBase.cxx
+++ b/Event/ByteStreamCnvSvcBase/src/ByteStreamCnvSvcBase.cxx
@@ -1,5 +1,5 @@
/*
- Copyright (C) 2002-2019 CERN for the benefit of the ATLAS collaboration
+ Copyright (C) 2002-2020 CERN for the benefit of the ATLAS collaboration
*/
#include "ByteStreamCnvSvcBase/ByteStreamCnvSvcBase.h"
@@ -16,8 +16,8 @@
//______________________________________________________________________________
ByteStreamCnvSvcBase::ByteStreamCnvSvcBase(const std::string& name, ISvcLocator* pSvcLocator) :
- ::AthCnvSvc(name, pSvcLocator, ByteStreamAddress::storageType()),
- m_rawEventWrite(0) {
+ ::AthCnvSvc(name, pSvcLocator, ByteStreamAddress::storageType())
+{
declareProperty("InitCnvs", m_initCnvs);
// This property is used by Tile BS converter, not by this class.
declareProperty("ROD2ROBmap", m_ROD2ROBmap);
diff --git a/Event/ByteStreamCnvSvcBase/src/components/ByteStreamCnvSvcBase_entries.cxx b/Event/ByteStreamCnvSvcBase/src/components/ByteStreamCnvSvcBase_entries.cxx
index 5d0e6d9f0c9..dec5cd347e9 100644
--- a/Event/ByteStreamCnvSvcBase/src/components/ByteStreamCnvSvcBase_entries.cxx
+++ b/Event/ByteStreamCnvSvcBase/src/components/ByteStreamCnvSvcBase_entries.cxx
@@ -1,9 +1,7 @@
-#include "ByteStreamCnvSvcBase/ByteStreamCnvSvcBase.h"
#include "ByteStreamCnvSvcBase/ByteStreamAddressProviderSvc.h"
#include "ByteStreamCnvSvcBase/ROBDataProviderSvc.h"
#include "../ROBDataProviderMTTest.h"
-DECLARE_COMPONENT( ByteStreamCnvSvcBase )
DECLARE_COMPONENT( ByteStreamAddressProviderSvc )
DECLARE_COMPONENT( ROBDataProviderSvc )
DECLARE_COMPONENT( ROBDataProviderMTTest )
--
GitLab