From 85d1aafe3a765c53cf776cec956d486376afe4b2 Mon Sep 17 00:00:00 2001 From: Frank Winklmeier <frank.winklmeier@cern.ch> Date: Mon, 9 Dec 2024 17:58:41 +0100 Subject: [PATCH] ByteStreamCnvSvc: fix access after move cppcheck defect Fix cppcheck defect and remove unnecessary error suppression. --- Event/ByteStreamCnvSvc/src/ByteStreamEventStorageInputSvc.cxx | 4 ++-- Event/ByteStreamCnvSvc/test/ByteStreamMetadataTool_test.cxx | 1 - 2 files changed, 2 insertions(+), 3 deletions(-) diff --git a/Event/ByteStreamCnvSvc/src/ByteStreamEventStorageInputSvc.cxx b/Event/ByteStreamCnvSvc/src/ByteStreamEventStorageInputSvc.cxx index 6ce4156c729c..66bbc4141583 100644 --- a/Event/ByteStreamCnvSvc/src/ByteStreamEventStorageInputSvc.cxx +++ b/Event/ByteStreamCnvSvc/src/ByteStreamEventStorageInputSvc.cxx @@ -410,10 +410,10 @@ ByteStreamEventStorageInputSvc::generateDataHeader() std::unique_ptr<DataHeader> dataHeader = std::make_unique<DataHeader>(); // Declare header primary dataHeader->setStatus(DataHeader::Input); - //add the data header element self reference to the object vector - dataHeader->insert(*std::move(dataHeaderElement)); // Set processTag dataHeader->setProcessTag(dataHeaderElement->getKey()); + //add the data header element self reference to the object vector + dataHeader->insert(*std::move(dataHeaderElement)); // Clean up EventInfo from the previous event key = m_eventInfoKey.value(); diff --git a/Event/ByteStreamCnvSvc/test/ByteStreamMetadataTool_test.cxx b/Event/ByteStreamCnvSvc/test/ByteStreamMetadataTool_test.cxx index ee3a38d95fe8..b2aaf6ba4944 100644 --- a/Event/ByteStreamCnvSvc/test/ByteStreamMetadataTool_test.cxx +++ b/Event/ByteStreamCnvSvc/test/ByteStreamMetadataTool_test.cxx @@ -89,7 +89,6 @@ namespace Athena_test { /** * An empty input store should not offend the tool and do nothing */ - // cppcheck-suppress syntaxError TEST_F(ByteStreamMetadataToolTest, emptyInput) { EXPECT_TRUE(m_tool->beginInputFile().isSuccess()); EXPECT_TRUE( -- GitLab