diff --git a/InnerDetector/InDetEventCnv/InDetEventTPCnv/src/InDetLowBetaInfo/InDetLowBetaCandidateCnv_tlp1.cxx b/InnerDetector/InDetEventCnv/InDetEventTPCnv/src/InDetLowBetaInfo/InDetLowBetaCandidateCnv_tlp1.cxx
index 25663ba0209d662a62ef234d06b8201bdf9a2b68..fae6b18ba1b0f72514a627f6071728292774ada2 100644
--- a/InnerDetector/InDetEventCnv/InDetEventTPCnv/src/InDetLowBetaInfo/InDetLowBetaCandidateCnv_tlp1.cxx
+++ b/InnerDetector/InDetEventCnv/InDetEventTPCnv/src/InDetLowBetaInfo/InDetLowBetaCandidateCnv_tlp1.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 "InDetEventTPCnv/InDetLowBetaInfo/InDetLowBetaCandidateCnv_tlp1.h"
@@ -16,11 +16,16 @@ void InDetLowBetaCandidateCnv_tlp1::setPStorage(InDetLowBetaCandidate_tlp1* stor
}
-void T_TPCnv<InDet::InDetLowBetaCandidate, InDetLowBetaCandidate_tlp1 >::persToTrans ATLAS_NOT_THREAD_SAFE // const_cast is used.
+void T_TPCnv<InDet::InDetLowBetaCandidate, InDetLowBetaCandidate_tlp1 >::persToTrans
(const InDetLowBetaCandidate_tlp1 *pers,
InDet::InDetLowBetaCandidate *trans,
MsgStream &msg) {
- setPStorage(const_cast<InDetLowBetaCandidate_tlp1*>(pers));
+ // FIXME: TPConverter uses the same non-const member m_pStorage
+ // for both reading and writing, but we want it to be const
+ // in the former case.
+ InDetLowBetaCandidate_tlp1 *pers_nc ATLAS_THREAD_SAFE =
+ const_cast<InDetLowBetaCandidate_tlp1*>(pers);
+ setPStorage(pers_nc);
m_mainConverter.pstoreToTrans(0, trans, msg);
}
diff --git a/InnerDetector/InDetEventCnv/InDetEventTPCnv/src/InDetLowBetaInfo/InDetLowBetaContainerCnv_tlp1.cxx b/InnerDetector/InDetEventCnv/InDetEventTPCnv/src/InDetLowBetaInfo/InDetLowBetaContainerCnv_tlp1.cxx
index d0e552f5088edab0e12047ecf7523b4337c96e44..3071b1f158712dc6e05c8e549733c0477bfd292d 100644
--- a/InnerDetector/InDetEventCnv/InDetEventTPCnv/src/InDetLowBetaInfo/InDetLowBetaContainerCnv_tlp1.cxx
+++ b/InnerDetector/InDetEventCnv/InDetEventTPCnv/src/InDetLowBetaInfo/InDetLowBetaContainerCnv_tlp1.cxx
@@ -20,11 +20,16 @@ void InDetLowBetaContainerCnv_tlp1::setPStorage(
m_lowBetaCandidateCnv.setPStorage(&storage->m_lowBetaCandidate);
}
-void T_TPCnv<InDet::InDetLowBetaContainer, InDetLowBetaContainer_tlp1>::persToTrans ATLAS_NOT_THREAD_SAFE // const_cast is used.
+void T_TPCnv<InDet::InDetLowBetaContainer, InDetLowBetaContainer_tlp1>::persToTrans
(const InDetLowBetaContainer_tlp1 *pers,
InDet::InDetLowBetaContainer *trans,
MsgStream &msg) {
- this->setTLPersObject(const_cast<InDetLowBetaContainer_tlp1*>(pers));
+ // FIXME: TPConverter uses the same non-const member m_pStorage
+ // for both reading and writing, but we want it to be const
+ // in the former case.
+ InDetLowBetaContainer_tlp1 *pers_nc ATLAS_THREAD_SAFE =
+ const_cast<InDetLowBetaContainer_tlp1*>(pers);
+ this->setTLPersObject(pers_nc);
m_mainConverter.pstoreToTrans(0, trans, msg);
this->clearTLPersObject();
diff --git a/InnerDetector/InDetEventCnv/InDetEventTPCnv/src/InDetPrepRawData/PixelGangedClusterAmbiguitiesCnv_p1.cxx b/InnerDetector/InDetEventCnv/InDetEventTPCnv/src/InDetPrepRawData/PixelGangedClusterAmbiguitiesCnv_p1.cxx
index 48c187995d5820a6edccc6526b093ec92322f775..ca87616fd94bd9d7629dc016023c652335dfc74a 100644
--- a/InnerDetector/InDetEventCnv/InDetEventTPCnv/src/InDetPrepRawData/PixelGangedClusterAmbiguitiesCnv_p1.cxx
+++ b/InnerDetector/InDetEventCnv/InDetEventTPCnv/src/InDetPrepRawData/PixelGangedClusterAmbiguitiesCnv_p1.cxx
@@ -20,7 +20,7 @@
#include "StoreGate/StoreGateSvc.h"
-void PixelGangedClusterAmbiguitiesCnv_p1::transToPers ATLAS_NOT_THREAD_SAFE // Thread unsafe DataHandle class is used.
+void PixelGangedClusterAmbiguitiesCnv_p1::transToPers
(const InDet::PixelGangedClusterAmbiguities* transObj, InDet::PixelGangedClusterAmbiguities_p1* persObj, MsgStream &log)
{
// if (log.level() <= MSG::DEBUG) log << MSG::DEBUG << " *** Writing InDet::PixelGangedClusterAmbiguities" << endmsg;
@@ -39,7 +39,7 @@ void PixelGangedClusterAmbiguitiesCnv_p1::transToPers ATLAS_NOT_THREAD_SAFE // T
InDet::PixelGangedClusterAmbiguities::const_iterator itrE = transObj->end();
InDet::PixelGangedClusterAmbiguities::const_iterator previous_itr = transObj->begin();
- const DataHandle<InDet::PixelClusterContainer> dh, dhEnd;
+ SG::ConstIterator<InDet::PixelClusterContainer> dh, dhEnd;
StatusCode sc = m_storeGate->retrieve(dh, dhEnd);
if (sc.isFailure()){
log << MSG::WARNING <<"No containers found!"<< endmsg;
diff --git a/InnerDetector/InDetEventCnv/InDetEventTPCnv/test/InDetLowBetaCandidateCnv_p1_test.cxx b/InnerDetector/InDetEventCnv/InDetEventTPCnv/test/InDetLowBetaCandidateCnv_p1_test.cxx
index 2113621bd79310c8aeb8c4139b6251bd9fccf001..04caed2330b6bea6d1d6cc1ee8ae7a0dcb150193 100644
--- a/InnerDetector/InDetEventCnv/InDetEventTPCnv/test/InDetLowBetaCandidateCnv_p1_test.cxx
+++ b/InnerDetector/InDetEventCnv/InDetEventTPCnv/test/InDetLowBetaCandidateCnv_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 InDetEventTPCnv/test/InDetLowBetaCandidateCnv_p1_test.cxx
* @author scott snyder <snyder@bnl.gov>
@@ -13,6 +11,7 @@
#undef NDEBUG
#include "InDetEventTPCnv/InDetLowBetaInfo/InDetLowBetaCandidateCnv_p1.h"
#include "TestTools/leakcheck.h"
+#include "CxxUtils/checker_macros.h"
#include "GaudiKernel/MsgStream.h"
#include <cassert>
#include <iostream>
@@ -45,7 +44,7 @@ void testit (const InDet::InDetLowBetaCandidate& trans1)
}
-void test1()
+void test1 ATLAS_NOT_THREAD_SAFE ()
{
std::cout << "test1\n";
Athena_test::Leakcheck check;
@@ -57,7 +56,7 @@ void test1()
}
-int main()
+int main ATLAS_NOT_THREAD_SAFE ()
{
test1();
return 0;
diff --git a/InnerDetector/InDetEventCnv/InDetEventTPCnv/test/PixelClusterCnv_p2_test.cxx b/InnerDetector/InDetEventCnv/InDetEventTPCnv/test/PixelClusterCnv_p2_test.cxx
index eb7933a3724cdea132ed0d77fe8018e3d270d4f5..f07a9eff41b78586816a83151e2cfa1ca29bf5ea 100644
--- a/InnerDetector/InDetEventCnv/InDetEventTPCnv/test/PixelClusterCnv_p2_test.cxx
+++ b/InnerDetector/InDetEventCnv/InDetEventTPCnv/test/PixelClusterCnv_p2_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 InDetEventTPCnv/test/PixelClusterCnv_p2_test.cxx
* @author scott snyder <snyder@bnl.gov>
@@ -13,6 +11,7 @@
#undef NDEBUG
#include "InDetEventTPCnv/InDetPrepRawData/PixelClusterCnv_p2.h"
#include "TestTools/leakcheck.h"
+#include "CxxUtils/checker_macros.h"
#include "GaudiKernel/MsgStream.h"
#include <cassert>
#include <iostream>
@@ -81,7 +80,7 @@ void testit (const InDet::PixelCluster& trans1)
}
-void test1()
+void test1 ATLAS_NOT_THREAD_SAFE ()
{
std::cout << "test1\n";
Athena_test::Leakcheck check;
@@ -137,7 +136,7 @@ void test1()
}
-int main()
+int main ATLAS_NOT_THREAD_SAFE ()
{
test1();
return 0;
diff --git a/InnerDetector/InDetEventCnv/InDetEventTPCnv/test/PixelClusterCnv_p3_test.cxx b/InnerDetector/InDetEventCnv/InDetEventTPCnv/test/PixelClusterCnv_p3_test.cxx
index adfae0919a3cfa360fd6786e0733fe7044641d6e..12f222463f78a1b14848a65c413cd396ae8c1f45 100644
--- a/InnerDetector/InDetEventCnv/InDetEventTPCnv/test/PixelClusterCnv_p3_test.cxx
+++ b/InnerDetector/InDetEventCnv/InDetEventTPCnv/test/PixelClusterCnv_p3_test.cxx
@@ -1,8 +1,6 @@
/*
- Copyright (C) 2002-2019 CERN for the benefit of the ATLAS collaboration
+ Copyright (C) 2002-2020 CERN for the benefit of the ATLAS collaboration
*/
-
-// $Id$
/**
* @file InDetEventTPCnv/test/PixelClusterCnv_p3_test.cxx
* @author scott snyder <snyder@bnl.gov>
@@ -15,6 +13,7 @@
#include "TestTools/leakcheck.h"
#include "InDetIdentifier/PixelID.h"
#include "IdDictParser/IdDictParser.h"
+#include "CxxUtils/checker_macros.h"
#include "GaudiKernel/MsgStream.h"
@@ -85,7 +84,7 @@ void testit (const PixelID& pix_id, const InDet::PixelCluster& trans1)
}
-void test1 (const PixelID& pix_id)
+void test1 ATLAS_NOT_THREAD_SAFE (const PixelID& pix_id)
{
std::cout << "test1\n";
Athena_test::Leakcheck check;
@@ -153,7 +152,7 @@ std::unique_ptr<PixelID> make_idhelper()
}
-int main()
+int main ATLAS_NOT_THREAD_SAFE ()
{
std::unique_ptr<PixelID> pix_id = make_idhelper();
test1(*pix_id);
diff --git a/InnerDetector/InDetEventCnv/InDetEventTPCnv/test/PixelClusterContainerCnv_p1_test.cxx b/InnerDetector/InDetEventCnv/InDetEventTPCnv/test/PixelClusterContainerCnv_p1_test.cxx
index 7c8ed50418dc6db945b90cd230a653d354a1dc5c..cb5071de0085bca3d6625ac5020c2fdd09c380f7 100644
--- a/InnerDetector/InDetEventCnv/InDetEventTPCnv/test/PixelClusterContainerCnv_p1_test.cxx
+++ b/InnerDetector/InDetEventCnv/InDetEventTPCnv/test/PixelClusterContainerCnv_p1_test.cxx
@@ -1,8 +1,6 @@
/*
Copyright (C) 2002-2020 CERN for the benefit of the ATLAS collaboration
*/
-
-// $Id$
/**
* @file InDetEventTPCnv/test/PixelClusterContainerCnv_p1_test.cxx
* @author scott snyder <snyder@bnl.gov>
@@ -19,6 +17,7 @@
#include "InDetIdentifier/PixelID.h"
#include "IdDictParser/IdDictParser.h"
#include "SGTools/TestStore.h"
+#include "CxxUtils/checker_macros.h"
#include "GaudiKernel/MsgStream.h"
@@ -171,7 +170,7 @@ makeclusts()
}
-void test1()
+void test1 ATLAS_NOT_THREAD_SAFE ()
{
std::cout << "test1\n";
@@ -204,7 +203,7 @@ void make_dd()
}
-int main()
+int main ATLAS_NOT_THREAD_SAFE ()
{
ISvcLocator* pSvcLoc;
if (!Athena_test::initGaudi("InDetEventTPCnv_test.txt", pSvcLoc)) {
diff --git a/InnerDetector/InDetEventCnv/InDetEventTPCnv/test/PixelClusterContainerCnv_p2_test.cxx b/InnerDetector/InDetEventCnv/InDetEventTPCnv/test/PixelClusterContainerCnv_p2_test.cxx
index 2bfd784c2f281ddd0ab5f1e377947fcce0c19137..836942c040adb34ebbb1bf4ee85a1baeb7ac2460 100644
--- a/InnerDetector/InDetEventCnv/InDetEventTPCnv/test/PixelClusterContainerCnv_p2_test.cxx
+++ b/InnerDetector/InDetEventCnv/InDetEventTPCnv/test/PixelClusterContainerCnv_p2_test.cxx
@@ -1,8 +1,6 @@
/*
Copyright (C) 2002-2020 CERN for the benefit of the ATLAS collaboration
*/
-
-// $Id$
/**
* @file InDetEventTPCnv/test/PixelClusterContainerCnv_p2_test.cxx
* @author scott snyder <snyder@bnl.gov>
@@ -18,6 +16,7 @@
#include "InDetIdentifier/PixelID.h"
#include "IdDictParser/IdDictParser.h"
#include "SGTools/TestStore.h"
+#include "CxxUtils/checker_macros.h"
#include "GaudiKernel/MsgStream.h"
@@ -167,7 +166,7 @@ makeclusts()
}
-void test1()
+void test1 ATLAS_NOT_THREAD_SAFE ()
{
std::cout << "test1\n";
@@ -200,7 +199,7 @@ void make_dd()
}
-int main()
+int main ATLAS_NOT_THREAD_SAFE ()
{
ISvcLocator* pSvcLoc;
if (!Athena_test::initGaudi("InDetEventTPCnv_test.txt", pSvcLoc)) {
diff --git a/InnerDetector/InDetEventCnv/InDetEventTPCnv/test/PixelClusterContainerCnv_p3_test.cxx b/InnerDetector/InDetEventCnv/InDetEventTPCnv/test/PixelClusterContainerCnv_p3_test.cxx
index 7b5c68d692dbce46ba80dd89f217b159dd0aa65a..b03ad87e7be98923396df6c9b221a8fbf918f520 100644
--- a/InnerDetector/InDetEventCnv/InDetEventTPCnv/test/PixelClusterContainerCnv_p3_test.cxx
+++ b/InnerDetector/InDetEventCnv/InDetEventTPCnv/test/PixelClusterContainerCnv_p3_test.cxx
@@ -1,8 +1,6 @@
/*
Copyright (C) 2002-2020 CERN for the benefit of the ATLAS collaboration
*/
-
-// $Id$
/**
* @file InDetEventTPCnv/test/PixelClusterContainerCnv_p3_test.cxx
* @author scott snyder <snyder@bnl.gov>
@@ -18,6 +16,7 @@
#include "InDetIdentifier/PixelID.h"
#include "IdDictParser/IdDictParser.h"
#include "SGTools/TestStore.h"
+#include "CxxUtils/checker_macros.h"
#include "GaudiKernel/MsgStream.h"
@@ -167,7 +166,7 @@ makeclusts()
}
-void test1()
+void test1 ATLAS_NOT_THREAD_SAFE ()
{
std::cout << "test1\n";
@@ -200,7 +199,7 @@ void make_dd()
}
-int main()
+int main ATLAS_NOT_THREAD_SAFE ()
{
ISvcLocator* pSvcLoc;
if (!Athena_test::initGaudi("InDetEventTPCnv_test.txt", pSvcLoc)) {
diff --git a/InnerDetector/InDetEventCnv/InDetEventTPCnv/test/PixelGangedClusterAmbiguitiesCnv_p1_test.cxx b/InnerDetector/InDetEventCnv/InDetEventTPCnv/test/PixelGangedClusterAmbiguitiesCnv_p1_test.cxx
index a7b18eb0fc465e1e5f45f20f665ff3915abbae0a..e27013e0d0ee421666d334ab79ba3737438b831e 100644
--- a/InnerDetector/InDetEventCnv/InDetEventTPCnv/test/PixelGangedClusterAmbiguitiesCnv_p1_test.cxx
+++ b/InnerDetector/InDetEventCnv/InDetEventTPCnv/test/PixelGangedClusterAmbiguitiesCnv_p1_test.cxx
@@ -15,6 +15,7 @@
#include "StoreGate/StoreGateSvc.h"
#include "TestTools/initGaudi.h"
#include "SGTools/TestStore.h"
+#include "CxxUtils/checker_macros.h"
#include "GaudiKernel/Bootstrap.h"
#include "GaudiKernel/MsgStream.h"
@@ -43,7 +44,7 @@ void testit (const InDet::PixelGangedClusterAmbiguities& trans1)
}
-void test1 (const InDet::PixelClusterContainer& cont)
+void test1 ATLAS_NOT_THREAD_SAFE (const InDet::PixelClusterContainer& cont)
{
std::cout << "test1\n";
Athena_test::Leakcheck check;
@@ -115,7 +116,7 @@ const InDet::PixelClusterContainer& makeclusts (StoreGateSvc* sg)
}
-int main()
+int main ATLAS_NOT_THREAD_SAFE ()
{
ISvcLocator* pSvcLoc;
if (!Athena_test::initGaudi("InDetEventTPCnv_test.txt", pSvcLoc)) {
diff --git a/InnerDetector/InDetEventCnv/InDetEventTPCnv/test/SCT_ClusterCnv_p2_test.cxx b/InnerDetector/InDetEventCnv/InDetEventTPCnv/test/SCT_ClusterCnv_p2_test.cxx
index affe1058bcab89308302377e8f9e4f5413b32707..f7d13dd32bbdc64031bdfea5519cb2e2dad1b769 100644
--- a/InnerDetector/InDetEventCnv/InDetEventTPCnv/test/SCT_ClusterCnv_p2_test.cxx
+++ b/InnerDetector/InDetEventCnv/InDetEventTPCnv/test/SCT_ClusterCnv_p2_test.cxx
@@ -1,8 +1,6 @@
/*
- Copyright (C) 2002-2019 CERN for the benefit of the ATLAS collaboration
+ Copyright (C) 2002-2020 CERN for the benefit of the ATLAS collaboration
*/
-
-// $Id$
/**
* @file InDetEventTPCnv/test/SCT_ClusterCnv_p2_test.cxx
* @author scott snyder <snyder@bnl.gov>
@@ -15,6 +13,7 @@
#include "TestTools/leakcheck.h"
#include "InDetIdentifier/SCT_ID.h"
#include "IdDictParser/IdDictParser.h"
+#include "CxxUtils/checker_macros.h"
#include "GaudiKernel/MsgStream.h"
@@ -76,7 +75,7 @@ void testit (const SCT_ID& sct_id, const InDet::SCT_Cluster& trans1)
}
-void test1 (const SCT_ID& sct_id)
+void test1 ATLAS_NOT_THREAD_SAFE (const SCT_ID& sct_id)
{
std::cout << "test1\n";
Athena_test::Leakcheck check;
@@ -116,7 +115,7 @@ std::unique_ptr<SCT_ID> make_idhelper()
}
-int main()
+int main ATLAS_NOT_THREAD_SAFE ()
{
std::unique_ptr<SCT_ID> sct_id = make_idhelper();
test1(*sct_id);
diff --git a/InnerDetector/InDetEventCnv/InDetEventTPCnv/test/SCT_ClusterCnv_p3_test.cxx b/InnerDetector/InDetEventCnv/InDetEventTPCnv/test/SCT_ClusterCnv_p3_test.cxx
index f4da7aa3b69e333fa168c0bdd9f035ab5e8f77ef..0106723f7976a098c929007351b257c5b43f20c1 100644
--- a/InnerDetector/InDetEventCnv/InDetEventTPCnv/test/SCT_ClusterCnv_p3_test.cxx
+++ b/InnerDetector/InDetEventCnv/InDetEventTPCnv/test/SCT_ClusterCnv_p3_test.cxx
@@ -1,8 +1,6 @@
/*
- Copyright (C) 2002-2019 CERN for the benefit of the ATLAS collaboration
+ Copyright (C) 2002-2020 CERN for the benefit of the ATLAS collaboration
*/
-
-// $Id$
/**
* @file InDetEventTPCnv/test/SCT_ClusterCnv_p3_test.cxx
* @author scott snyder <snyder@bnl.gov>
@@ -15,6 +13,7 @@
#include "TestTools/leakcheck.h"
#include "InDetIdentifier/SCT_ID.h"
#include "IdDictParser/IdDictParser.h"
+#include "CxxUtils/checker_macros.h"
#include "GaudiKernel/MsgStream.h"
@@ -76,7 +75,7 @@ void testit (const SCT_ID& sct_id, const InDet::SCT_Cluster& trans1)
}
-void test1 (const SCT_ID& sct_id)
+void test1 ATLAS_NOT_THREAD_SAFE (const SCT_ID& sct_id)
{
std::cout << "test1\n";
Athena_test::Leakcheck check;
@@ -116,7 +115,7 @@ std::unique_ptr<SCT_ID> make_idhelper()
}
-int main()
+int main ATLAS_NOT_THREAD_SAFE ()
{
std::unique_ptr<SCT_ID> sct_id = make_idhelper();
test1(*sct_id);
diff --git a/InnerDetector/InDetEventCnv/InDetEventTPCnv/test/SCT_ClusterContainerCnv_p2_test.cxx b/InnerDetector/InDetEventCnv/InDetEventTPCnv/test/SCT_ClusterContainerCnv_p2_test.cxx
index 62f2054ef0768b8ab1e70ac302711865d7b16758..ff2a3970a6c3e717f51e35f0cc7fda21f6e36ce3 100644
--- a/InnerDetector/InDetEventCnv/InDetEventTPCnv/test/SCT_ClusterContainerCnv_p2_test.cxx
+++ b/InnerDetector/InDetEventCnv/InDetEventTPCnv/test/SCT_ClusterContainerCnv_p2_test.cxx
@@ -1,8 +1,6 @@
/*
Copyright (C) 2002-2020 CERN for the benefit of the ATLAS collaboration
*/
-
-// $Id$
/**
* @file InDetEventTPCnv/test/SCT_ClusterContainerCnv_p2_test.cxx
* @author scott snyder <snyder@bnl.gov>
@@ -19,6 +17,7 @@
#include "IdDictParser/IdDictParser.h"
#include "SGTools/TestStore.h"
#include "InDetReadoutGeometry/SiDetectorElementCollection.h"
+#include "CxxUtils/checker_macros.h"
#include "GaudiKernel/MsgStream.h"
@@ -144,7 +143,7 @@ makeclusts(const SCT_ID& sct_id)
}
-void test1(const SCT_ID& sct_id)
+void test1 ATLAS_NOT_THREAD_SAFE (const SCT_ID& sct_id)
{
std::cout << "test1\n";
@@ -180,7 +179,7 @@ const SCT_ID& make_dd()
}
-int main()
+int main ATLAS_NOT_THREAD_SAFE ()
{
ISvcLocator* pSvcLoc;
if (!Athena_test::initGaudi("InDetEventTPCnv_test.txt", pSvcLoc)) {
diff --git a/InnerDetector/InDetEventCnv/InDetEventTPCnv/test/SCT_ClusterContainerCnv_p3_test.cxx b/InnerDetector/InDetEventCnv/InDetEventTPCnv/test/SCT_ClusterContainerCnv_p3_test.cxx
index 08909a94cf76c0f27d5e7272f36479b1753f5496..3c0c653a43be104940826754e6cb0463cfa951c6 100644
--- a/InnerDetector/InDetEventCnv/InDetEventTPCnv/test/SCT_ClusterContainerCnv_p3_test.cxx
+++ b/InnerDetector/InDetEventCnv/InDetEventTPCnv/test/SCT_ClusterContainerCnv_p3_test.cxx
@@ -1,8 +1,6 @@
/*
Copyright (C) 2002-2020 CERN for the benefit of the ATLAS collaboration
*/
-
-// $Id$
/**
* @file InDetEventTPCnv/test/SCT_ClusterContainerCnv_p3_test.cxx
* @author scott snyder <snyder@bnl.gov>
@@ -19,6 +17,7 @@
#include "IdDictParser/IdDictParser.h"
#include "SGTools/TestStore.h"
#include "InDetReadoutGeometry/SiDetectorElementCollection.h"
+#include "CxxUtils/checker_macros.h"
#include "GaudiKernel/MsgStream.h"
@@ -144,7 +143,7 @@ makeclusts(const SCT_ID& sct_id)
}
-void test1(const SCT_ID& sct_id)
+void test1 ATLAS_NOT_THREAD_SAFE (const SCT_ID& sct_id)
{
std::cout << "test1\n";
@@ -180,7 +179,7 @@ const SCT_ID& make_dd()
}
-int main()
+int main ATLAS_NOT_THREAD_SAFE ()
{
ISvcLocator* pSvcLoc;
if (!Athena_test::initGaudi("InDetEventTPCnv_test.txt", pSvcLoc)) {
diff --git a/InnerDetector/InDetEventCnv/InDetEventTPCnv/test/SiWidthCnv_p2_test.cxx b/InnerDetector/InDetEventCnv/InDetEventTPCnv/test/SiWidthCnv_p2_test.cxx
index 9789ef8a4f6e99fa709b21ba21b252224032dca5..fffae77707ae46bfc6d79616e59a873704d5225f 100644
--- a/InnerDetector/InDetEventCnv/InDetEventTPCnv/test/SiWidthCnv_p2_test.cxx
+++ b/InnerDetector/InDetEventCnv/InDetEventTPCnv/test/SiWidthCnv_p2_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 InDetEventTPCnv/test/SiWidthCnv_p2_test.cxx
* @author scott snyder <snyder@bnl.gov>
@@ -13,6 +11,7 @@
#undef NDEBUG
#include "InDetEventTPCnv/InDetPrepRawData/SiWidthCnv_p2.h"
#include "TestTools/leakcheck.h"
+#include "CxxUtils/checker_macros.h"
#include "GaudiKernel/MsgStream.h"
#include <cassert>
#include <iostream>
@@ -39,7 +38,7 @@ void testit (const InDet::SiWidth& trans1)
}
-void test1()
+void test1 ATLAS_NOT_THREAD_SAFE ()
{
std::cout << "test1\n";
Athena_test::Leakcheck check;
@@ -51,7 +50,7 @@ void test1()
}
-int main()
+int main ATLAS_NOT_THREAD_SAFE ()
{
test1();
return 0;
diff --git a/InnerDetector/InDetEventCnv/InDetEventTPCnv/test/TRT_DriftCircleCnv_p1_test.cxx b/InnerDetector/InDetEventCnv/InDetEventTPCnv/test/TRT_DriftCircleCnv_p1_test.cxx
index 974605a577948869557c9a30cebc70aeac247852..729e0f3a2cbc7c77a1465291d432e9b3c9fd2341 100644
--- a/InnerDetector/InDetEventCnv/InDetEventTPCnv/test/TRT_DriftCircleCnv_p1_test.cxx
+++ b/InnerDetector/InDetEventCnv/InDetEventTPCnv/test/TRT_DriftCircleCnv_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 InDetEventTPCnv/test/TRT_DriftCircleCnv_p1_test.cxx
* @author scott snyder <snyder@bnl.gov>
@@ -14,6 +12,7 @@
#include "InDetEventTPCnv/InDetPrepRawData/TRT_DriftCircleCnv_p1.h"
#include "InDetEventTPCnv/TRT_DriftCircleContainerCnv_tlp1.h"
#include "TestTools/leakcheck.h"
+#include "CxxUtils/checker_macros.h"
#include "GaudiKernel/MsgStream.h"
#include <cassert>
#include <iostream>
@@ -52,7 +51,7 @@ void testit (const InDet::TRT_DriftCircle& trans1)
}
-void test1()
+void test1 ATLAS_NOT_THREAD_SAFE ()
{
std::cout << "test1\n";
Athena_test::Leakcheck check;
@@ -77,7 +76,7 @@ void test1()
}
-int main()
+int main ATLAS_NOT_THREAD_SAFE ()
{
test1();
return 0;
diff --git a/InnerDetector/InDetEventCnv/InDetEventTPCnv/test/TRT_DriftCircleCnv_p2_test.cxx b/InnerDetector/InDetEventCnv/InDetEventTPCnv/test/TRT_DriftCircleCnv_p2_test.cxx
index 650ee0f8f41e1ebdfdf71fe48a73bd4264a421ed..a9568a7f8707406871739a49a6512c6aa798fb1d 100644
--- a/InnerDetector/InDetEventCnv/InDetEventTPCnv/test/TRT_DriftCircleCnv_p2_test.cxx
+++ b/InnerDetector/InDetEventCnv/InDetEventTPCnv/test/TRT_DriftCircleCnv_p2_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 InDetEventTPCnv/test/TRT_DriftCircleCnv_p2_test.cxx
* @author scott snyder <snyder@bnl.gov>
@@ -14,6 +12,7 @@
#include "InDetEventTPCnv/InDetPrepRawData/TRT_DriftCircleCnv_p2.h"
#include "TestTools/leakcheck.h"
#include "InDetPrepRawData/TRT_DriftCircle.h"
+#include "CxxUtils/checker_macros.h"
#include "GaudiKernel/MsgStream.h"
#include <cassert>
#include <iostream>
@@ -55,7 +54,7 @@ void testit (const InDet::TRT_DriftCircle& trans1)
}
-void test1()
+void test1 ATLAS_NOT_THREAD_SAFE ()
{
std::cout << "test1\n";
Athena_test::Leakcheck check;
@@ -80,7 +79,7 @@ void test1()
}
-int main()
+int main ATLAS_NOT_THREAD_SAFE ()
{
test1();
return 0;
diff --git a/InnerDetector/InDetEventCnv/InDetEventTPCnv/test/TRT_DriftCircleContainerCnv_p2_test.cxx b/InnerDetector/InDetEventCnv/InDetEventTPCnv/test/TRT_DriftCircleContainerCnv_p2_test.cxx
index 9bac367dac71527063e43d715e520a9f56396b84..573bec38480128bcceb7be234f7864e1ca14de3f 100644
--- a/InnerDetector/InDetEventCnv/InDetEventTPCnv/test/TRT_DriftCircleContainerCnv_p2_test.cxx
+++ b/InnerDetector/InDetEventCnv/InDetEventTPCnv/test/TRT_DriftCircleContainerCnv_p2_test.cxx
@@ -1,8 +1,6 @@
/*
Copyright (C) 2002-2020 CERN for the benefit of the ATLAS collaboration
*/
-
-// $Id$
/**
* @file InDetEventTPCnv/test/TRT_DriftCircleContainerCnv_p2_test.cxx
* @author scott snyder <snyder@bnl.gov>
@@ -20,6 +18,7 @@
#include "IdDictParser/IdDictParser.h"
#include "SGTools/TestStore.h"
#include "TRT_ReadoutGeometry/TRT_DetElementContainer.h"
+#include "CxxUtils/checker_macros.h"
#include "GaudiKernel/MsgStream.h"
@@ -123,7 +122,7 @@ makeclusts (const TRT_ID& trt_id)
}
-void test1 (const TRT_ID& trt_id)
+void test1 ATLAS_NOT_THREAD_SAFE (const TRT_ID& trt_id)
{
std::cout << "test1\n";
MsgStream log (0, "test");
@@ -162,7 +161,7 @@ const TRT_ID& make_dd()
}
-int main()
+int main ATLAS_NOT_THREAD_SAFE ()
{
ISvcLocator* pSvcLoc;
if (!Athena_test::initGaudi("InDetEventTPCnv_test.txt", pSvcLoc)) {