diff --git a/DetectorDescription/DetDescrCond/DetDescrCondAthenaPool/ATLAS_CHECK_THREAD_SAFETY b/DetectorDescription/DetDescrCond/DetDescrCondAthenaPool/ATLAS_CHECK_THREAD_SAFETY
new file mode 100644
index 0000000000000000000000000000000000000000..fe828ed1918e07d423ea51491b4dcfa2352f2699
--- /dev/null
+++ b/DetectorDescription/DetDescrCond/DetDescrCondAthenaPool/ATLAS_CHECK_THREAD_SAFETY
@@ -0,0 +1 @@
+DetectorDescription/DetDescrCond/DetDescrCondAthenaPool
diff --git a/DetectorDescription/DetDescrCond/DetDescrCondAthenaPool/src/AlignableTransformContainerCnv.cxx b/DetectorDescription/DetDescrCond/DetDescrCondAthenaPool/src/AlignableTransformContainerCnv.cxx
index fd95a65c33e0f342f2470bba5a2ce5addf2ddf0c..174929f2b912236e0be632d3b4c600315f955b91 100644
--- a/DetectorDescription/DetDescrCond/DetDescrCondAthenaPool/src/AlignableTransformContainerCnv.cxx
+++ b/DetectorDescription/DetDescrCond/DetDescrCondAthenaPool/src/AlignableTransformContainerCnv.cxx
@@ -22,8 +22,8 @@ AlignableTransform_PERS* AlignableTransformContainerCnv::createPersistent(Aligna
AlignableTransform_TRANS* AlignableTransformContainerCnv::createTransient() {
MsgStream log(msgSvc(), "AlignableTransformContainerCnv" );
- static pool::Guid p1_guid("BA1A841C-8D92-45AE-9AD1-9AF7A1736844");
- static pool::Guid p0_guid("E779C6B5-3F2A-473E-B35E-6CCB345E0665");
+ static const pool::Guid p1_guid("BA1A841C-8D92-45AE-9AD1-9AF7A1736844");
+ static const pool::Guid p0_guid("E779C6B5-3F2A-473E-B35E-6CCB345E0665");
if( compareClassGuid(p1_guid) ) {
// using unique_ptr ensures deletion of the persistent object
if (log.level()<=MSG::DEBUG) log << MSG::DEBUG << "AlignableTransformContainer read p1" << endmsg;
diff --git a/DetectorDescription/DetDescrCond/DetDescrCondTPCnv/DetDescrCondTPCnv/ATLAS_CHECK_THREAD_SAFETY b/DetectorDescription/DetDescrCond/DetDescrCondTPCnv/DetDescrCondTPCnv/ATLAS_CHECK_THREAD_SAFETY
new file mode 100644
index 0000000000000000000000000000000000000000..03bf2b0d3b1fadb6706597c1922f7959871055f4
--- /dev/null
+++ b/DetectorDescription/DetDescrCond/DetDescrCondTPCnv/DetDescrCondTPCnv/ATLAS_CHECK_THREAD_SAFETY
@@ -0,0 +1 @@
+DetectorDescription/DetDescrCond/DetDescrCondTPCnv
diff --git a/DetectorDescription/DetDescrCond/DetDescrCondTPCnv/test/AlignableTransformCnv_p1_test.cxx b/DetectorDescription/DetDescrCond/DetDescrCondTPCnv/test/AlignableTransformCnv_p1_test.cxx
index b5439dac45c3d35dcb2562b2880d0623e476502c..e1df2929cb90c85bd01ae977a3e3cdfab287c461 100644
--- a/DetectorDescription/DetDescrCond/DetDescrCondTPCnv/test/AlignableTransformCnv_p1_test.cxx
+++ b/DetectorDescription/DetDescrCond/DetDescrCondTPCnv/test/AlignableTransformCnv_p1_test.cxx
@@ -1,8 +1,6 @@
/*
- Copyright (C) 2002-2017 CERN for the benefit of the ATLAS collaboration
+ Copyright (C) 2002-2020 CERN for the benefit of the ATLAS collaboration
*/
-
-// $Id$
/**
* @file DetDescrCondTPCnv/test/AlignableTransformCnv_p1_test.cxx
* @author scott snyder <snyder@bnl.gov>
@@ -13,6 +11,7 @@
#undef NDEBUG
#include "DetDescrCondTPCnv/AlignableTransformCnv_p1.h"
#include "TestTools/leakcheck.h"
+#include "CxxUtils/checker_macros.h"
#include "GaudiKernel/MsgStream.h"
#include <cassert>
#include <iostream>
@@ -26,7 +25,7 @@ HepGeom::Transform3D makexform (float dx, float dy, float dz,
}
-void test1()
+void test1 ATLAS_NOT_THREAD_SAFE ()
{
std::cout << "test1\n";
Athena_test::Leakcheck check;
@@ -65,7 +64,7 @@ void test1()
}
-int main()
+int main ATLAS_NOT_THREAD_SAFE ()
{
test1();
return 0;
diff --git a/DetectorDescription/DetDescrCond/DetDescrCondTPCnv/test/DetCondCFloatCnv_p1_test.cxx b/DetectorDescription/DetDescrCond/DetDescrCondTPCnv/test/DetCondCFloatCnv_p1_test.cxx
index 28595c834a7e7adbe4b261773be8e8578ab45a51..f94ec193d769f559ba3fe46ec6b6326dd50bdbe0 100644
--- a/DetectorDescription/DetDescrCond/DetDescrCondTPCnv/test/DetCondCFloatCnv_p1_test.cxx
+++ b/DetectorDescription/DetDescrCond/DetDescrCondTPCnv/test/DetCondCFloatCnv_p1_test.cxx
@@ -1,8 +1,6 @@
/*
- Copyright (C) 2002-2017 CERN for the benefit of the ATLAS collaboration
+ Copyright (C) 2002-2020 CERN for the benefit of the ATLAS collaboration
*/
-
-// $Id$
/**
* @file DetDescrCondTPCnv/test/DetCondCFloatCnv_p1_test.cxx
* @author scott snyder <snyder@bnl.gov>
@@ -13,12 +11,13 @@
#undef NDEBUG
#include "DetDescrCondTPCnv/DetCondCFloatCnv_p1.h"
#include "TestTools/leakcheck.h"
+#include "CxxUtils/checker_macros.h"
#include "GaudiKernel/MsgStream.h"
#include <cassert>
#include <iostream>
-void test1()
+void test1 ATLAS_NOT_THREAD_SAFE ()
{
std::cout << "test1\n";
Athena_test::Leakcheck check;
@@ -48,7 +47,7 @@ void test1()
}
-int main()
+int main ATLAS_NOT_THREAD_SAFE ()
{
test1();
return 0;
diff --git a/DetectorDescription/DetDescrCond/DetDescrCondTPCnv/test/DetCondKeyTransCnv_p1_test.cxx b/DetectorDescription/DetDescrCond/DetDescrCondTPCnv/test/DetCondKeyTransCnv_p1_test.cxx
index ad5eb2dcce8576458b9d0a33538025c63642db5e..da33246b0ba2f92493979eedfaefc7c7467b0d6f 100644
--- a/DetectorDescription/DetDescrCond/DetDescrCondTPCnv/test/DetCondKeyTransCnv_p1_test.cxx
+++ b/DetectorDescription/DetDescrCond/DetDescrCondTPCnv/test/DetCondKeyTransCnv_p1_test.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
*/
/**
* @file DetDescrCondTPCnv/test/DetCondKeyTransCnv_p1_test.cxx
@@ -11,6 +11,7 @@
#undef NDEBUG
#include "DetDescrCondTPCnv/DetCondKeyTransCnv_p1.h"
#include "TestTools/leakcheck.h"
+#include "CxxUtils/checker_macros.h"
#include "GaudiKernel/MsgStream.h"
#include <cassert>
#include <iostream>
@@ -24,7 +25,7 @@ HepGeom::Transform3D makexform (float dx, float dy, float dz,
}
-void test1()
+void test1 ATLAS_NOT_THREAD_SAFE ()
{
std::cout << "test1\n";
Athena_test::Leakcheck check;
@@ -54,7 +55,7 @@ void test1()
}
-int main()
+int main ATLAS_NOT_THREAD_SAFE ()
{
test1();
return 0;
diff --git a/DetectorDescription/DetDescrCond/DetDescrCondTPCnv/test/DetDescrCondIdentifier_old_cnv_test.cxx b/DetectorDescription/DetDescrCond/DetDescrCondTPCnv/test/DetDescrCondIdentifier_old_cnv_test.cxx
index 033dfab876240dd8e29d9390eca2d82110d7bdf6..f3b17c3d0a70cc1a53d825ab4bbaf38ad780d464 100644
--- a/DetectorDescription/DetDescrCond/DetDescrCondTPCnv/test/DetDescrCondIdentifier_old_cnv_test.cxx
+++ b/DetectorDescription/DetDescrCond/DetDescrCondTPCnv/test/DetDescrCondIdentifier_old_cnv_test.cxx
@@ -1,8 +1,6 @@
/*
- Copyright (C) 2002-2017 CERN for the benefit of the ATLAS collaboration
+ Copyright (C) 2002-2020 CERN for the benefit of the ATLAS collaboration
*/
-
-// $Id$
/**
* @file DetDescrCondTPCnv/test/DetDescrCondIdentifier_old_cnv_test.cxx
* @author scott snyder <snyder@bnl.gov>
@@ -14,12 +12,13 @@
#include "DetDescrCondTPCnv/DetDescrCondIdentifier_old_cnv.h"
#include "TestTools/leakcheck.h"
#include "CxxUtils/ubsan_suppress.h"
+#include "CxxUtils/checker_macros.h"
#include "TInterpreter.h"
#include <cassert>
#include <iostream>
-void test1()
+void test1 ATLAS_NOT_THREAD_SAFE ()
{
std::cout << "test1\n";
DetDescrCondIdentifier_old_cnv cnv;
@@ -34,7 +33,7 @@ void test1()
}
-int main()
+int main ATLAS_NOT_THREAD_SAFE ()
{
CxxUtils::ubsan_suppress ([]() { TInterpreter::Instance(); });
test1();
diff --git a/DetectorDescription/DetDescrCond/DetDescrCondTPCnv/test/DetStatusMapCnv_p1_test.cxx b/DetectorDescription/DetDescrCond/DetDescrCondTPCnv/test/DetStatusMapCnv_p1_test.cxx
index 8cf894e889cb29ecb76e04175ae24503b749f816..e3d9cf0b3add0c6bc3f26170cbcc81e718ea40d0 100644
--- a/DetectorDescription/DetDescrCond/DetDescrCondTPCnv/test/DetStatusMapCnv_p1_test.cxx
+++ b/DetectorDescription/DetDescrCond/DetDescrCondTPCnv/test/DetStatusMapCnv_p1_test.cxx
@@ -1,8 +1,6 @@
/*
- Copyright (C) 2002-2017 CERN for the benefit of the ATLAS collaboration
+ Copyright (C) 2002-2020 CERN for the benefit of the ATLAS collaboration
*/
-
-// $Id$
/**
* @file DetDescrCondTPCnv/test/DetStatusMapCnv_p1_test.cxx
* @author scott snyder <snyder@bnl.gov>
@@ -13,12 +11,13 @@
#undef NDEBUG
#include "DetDescrCondTPCnv/DetStatusMapCnv_p1.h"
#include "TestTools/leakcheck.h"
+#include "CxxUtils/checker_macros.h"
#include "GaudiKernel/MsgStream.h"
#include <cassert>
#include <iostream>
-void test1()
+void test1 ATLAS_NOT_THREAD_SAFE ()
{
std::cout << "test1\n";
Athena_test::Leakcheck check;
@@ -54,7 +53,7 @@ void test1()
}
-int main()
+int main ATLAS_NOT_THREAD_SAFE ()
{
test1();
return 0;