From 61d12ae908f25a86856c54a30b3cf5e8e11c9488 Mon Sep 17 00:00:00 2001
From: scott snyder <sss@karma>
Date: Fri, 25 Sep 2020 10:30:23 -0400
Subject: [PATCH] MuonMDT_CnvTools: Thread-safety cleanup.
Thread-safety annotations should match between declarations and definitions.
---
.../MuonCnv/MuonMDT_CnvTools/src/MDT_RawDataProviderTool.h | 4 ++--
.../MuonCnv/MuonMDT_CnvTools/src/MdtRdoToPrepDataTool.cxx | 2 +-
.../MuonCnv/MuonMDT_CnvTools/src/MdtRdoToPrepDataTool.h | 3 ++-
3 files changed, 5 insertions(+), 4 deletions(-)
diff --git a/MuonSpectrometer/MuonCnv/MuonMDT_CnvTools/src/MDT_RawDataProviderTool.h b/MuonSpectrometer/MuonCnv/MuonMDT_CnvTools/src/MDT_RawDataProviderTool.h
index ee6302337ed..a23afd65465 100644
--- a/MuonSpectrometer/MuonCnv/MuonMDT_CnvTools/src/MDT_RawDataProviderTool.h
+++ b/MuonSpectrometer/MuonCnv/MuonMDT_CnvTools/src/MDT_RawDataProviderTool.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 MUONMDTCNVTOOLS_MUONMDTRAWDATAPROVIDERTOOL_H
@@ -39,7 +39,7 @@ class ATLAS_NOT_THREAD_SAFE MDT_RawDataProviderTool : virtual public IMuonRawDat
virtual StatusCode finalize ();
/** Convert method - declared in Muon::IMuonRdoToPrepDataTool*/
- virtual StatusCode convert( const std::vector<const OFFLINE_FRAGMENTS_NAMESPACE::ROBFragment*>& vecRobs);
+ virtual StatusCode convert ATLAS_NOT_THREAD_SAFE ( const std::vector<const OFFLINE_FRAGMENTS_NAMESPACE::ROBFragment*>& vecRobs);
virtual StatusCode convert( const std::vector<const OFFLINE_FRAGMENTS_NAMESPACE::ROBFragment*>& vecRobs, const std::vector<IdentifierHash>&);
/** the new ones */
virtual StatusCode convert(); //!< for the entire event
diff --git a/MuonSpectrometer/MuonCnv/MuonMDT_CnvTools/src/MdtRdoToPrepDataTool.cxx b/MuonSpectrometer/MuonCnv/MuonMDT_CnvTools/src/MdtRdoToPrepDataTool.cxx
index 1c11ae58838..0506b43b1a2 100644
--- a/MuonSpectrometer/MuonCnv/MuonMDT_CnvTools/src/MdtRdoToPrepDataTool.cxx
+++ b/MuonSpectrometer/MuonCnv/MuonMDT_CnvTools/src/MdtRdoToPrepDataTool.cxx
@@ -21,7 +21,7 @@ StatusCode Muon::MdtRdoToPrepDataTool::initialize()
return StatusCode::SUCCESS;
}
-Muon::MdtRdoToPrepDataTool::SetupMdtPrepDataContainerStatus Muon::MdtRdoToPrepDataTool::setupMdtPrepDataContainer ATLAS_NOT_THREAD_SAFE()
+Muon::MdtRdoToPrepDataTool::SetupMdtPrepDataContainerStatus Muon::MdtRdoToPrepDataTool::setupMdtPrepDataContainer()
{
if(!evtStore()->contains<Muon::MdtPrepDataContainer>(m_mdtPrepDataContainerKey.key())){
m_fullEventDone=false;
diff --git a/MuonSpectrometer/MuonCnv/MuonMDT_CnvTools/src/MdtRdoToPrepDataTool.h b/MuonSpectrometer/MuonCnv/MuonMDT_CnvTools/src/MdtRdoToPrepDataTool.h
index 1ea69192d30..9b0a3fc60de 100644
--- a/MuonSpectrometer/MuonCnv/MuonMDT_CnvTools/src/MdtRdoToPrepDataTool.h
+++ b/MuonSpectrometer/MuonCnv/MuonMDT_CnvTools/src/MdtRdoToPrepDataTool.h
@@ -6,6 +6,7 @@
#define MUONMdtRdoToPrepDataTool_H
#include "MdtRdoToPrepDataToolCore.h"
+#include "CxxUtils/checker_macros.h"
namespace Muon
{
@@ -21,7 +22,7 @@ namespace Muon
@author Edward Moyse <Edward.Moyse@cern.ch>
*/
- class MdtRdoToPrepDataTool : virtual public MdtRdoToPrepDataToolCore
+ class ATLAS_NOT_THREAD_SAFE MdtRdoToPrepDataTool : virtual public MdtRdoToPrepDataToolCore
{
public:
MdtRdoToPrepDataTool(const std::string&,const std::string&,const IInterface*);
--
GitLab