From be105909b59532fa9fc3ea2a84d24523e320df91 Mon Sep 17 00:00:00 2001
From: Susumu Oda <susumu.oda@cern.ch>
Date: Tue, 30 Jun 2020 05:29:35 +0200
Subject: [PATCH] Remove ATLAS_NO_CHECK_FILE_THREAD_SAFETY from
TRT_FillCablingData_DC3.h/cxx. Add ATLAS_NOT_THREAD_SAFE to defineTables and
initialize of TRT_FillCablingData_DC3.
---
.../TRT_Cabling/src/TRT_FillCablingData_DC3.cxx | 6 ++----
.../InDetDetDescr/TRT_Cabling/src/TRT_FillCablingData_DC3.h | 4 ----
2 files changed, 2 insertions(+), 8 deletions(-)
diff --git a/InnerDetector/InDetDetDescr/TRT_Cabling/src/TRT_FillCablingData_DC3.cxx b/InnerDetector/InDetDetDescr/TRT_Cabling/src/TRT_FillCablingData_DC3.cxx
index 9ce495a8826..fc34a7f05e2 100644
--- a/InnerDetector/InDetDetDescr/TRT_Cabling/src/TRT_FillCablingData_DC3.cxx
+++ b/InnerDetector/InDetDetDescr/TRT_Cabling/src/TRT_FillCablingData_DC3.cxx
@@ -49,8 +49,6 @@
#include "CxxUtils/checker_macros.h"
-ATLAS_NO_CHECK_FILE_THREAD_SAFETY; // std::exit is used.
-
using eformat::helper::SourceIdentifier;
using namespace std;
@@ -81,7 +79,7 @@ const InterfaceID& TRT_FillCablingData_DC3::interfaceID( )
// Initialisation
-StatusCode TRT_FillCablingData_DC3::initialize( )
+StatusCode TRT_FillCablingData_DC3::initialize ATLAS_NOT_THREAD_SAFE ( ) // thread unsafe TRT_FillCablingData_DC3::defineTables is used.
{
ATH_MSG_INFO( "TRT_FillCablingData_DC3::initialize" );
@@ -175,7 +173,7 @@ void TRT_FillCablingData_DC3::defineParameters()
// Fill Tables with IDs for all straws
-void TRT_FillCablingData_DC3::defineTables()
+void TRT_FillCablingData_DC3::defineTables ATLAS_NOT_THREAD_SAFE () // thread unsafe std::exit is used.
{
ATH_MSG_INFO( "In defineTables" );
diff --git a/InnerDetector/InDetDetDescr/TRT_Cabling/src/TRT_FillCablingData_DC3.h b/InnerDetector/InDetDetDescr/TRT_Cabling/src/TRT_FillCablingData_DC3.h
index 3e31ac729bb..119bfff7999 100644
--- a/InnerDetector/InDetDetDescr/TRT_Cabling/src/TRT_FillCablingData_DC3.h
+++ b/InnerDetector/InDetDetDescr/TRT_Cabling/src/TRT_FillCablingData_DC3.h
@@ -15,8 +15,6 @@
*/
#include "AthenaBaseComps/AthAlgTool.h"
-#include "CxxUtils/checker_macros.h"
-
#include "Identifier/Identifier.h"
#include "Identifier/IdentifierHash.h"
#include "Identifier/IdContext.h"
@@ -32,8 +30,6 @@
#include <vector>
#include <stdint.h>
-ATLAS_NO_CHECK_FILE_THREAD_SAFETY; // std::exit is used.
-
class TRT_FillCablingData_DC3: public AthAlgTool {
public:
--
GitLab