From 1de4d8eee5e2c052378a28fae80a4c3cd186f1b6 Mon Sep 17 00:00:00 2001
From: scott snyder <sss@karma>
Date: Thu, 19 May 2022 12:03:10 -0400
Subject: [PATCH] TrigCaloEventTPCnv: Enable thread-safety checking.

Enable thread-safety checking and fix warnings.
---
 Trigger/TrigEvent/TrigCaloEventTPCnv/CMakeLists.txt      | 4 ++--
 .../TrigCaloEventTPCnv/ATLAS_CHECK_THREAD_SAFETY         | 1 +
 .../TrigCaloEventTPCnv/test/RingerRingsCnv_p1_test.cxx   | 9 ++++-----
 .../TrigCaloEventTPCnv/test/RingerRingsCnv_p2_test.cxx   | 9 ++++-----
 .../test/TrigCaloClusterCnv_p1_test.cxx                  | 9 ++++-----
 .../test/TrigCaloClusterCnv_p2_test.cxx                  | 9 ++++-----
 .../test/TrigCaloClusterCnv_p3_test.cxx                  | 9 ++++-----
 .../TrigCaloEventTPCnv/test/TrigEMClusterCnv_p2_test.cxx | 7 ++++---
 .../TrigCaloEventTPCnv/test/TrigEMClusterCnv_p3_test.cxx | 7 ++++---
 .../TrigCaloEventTPCnv/test/TrigEMClusterCnv_p4_test.cxx | 7 ++++---
 .../TrigCaloEventTPCnv/test/TrigRNNOutputCnv_p1_test.cxx | 7 ++++---
 .../TrigCaloEventTPCnv/test/TrigRNNOutputCnv_p2_test.cxx | 7 ++++---
 .../TrigCaloEventTPCnv/test/TrigT2JetCnv_p2_test.cxx     | 9 ++++-----
 .../TrigCaloEventTPCnv/test/TrigT2JetCnv_p3_test.cxx     | 9 ++++-----
 .../test/TrigT2MbtsBitsCnv_p1_test.cxx                   | 9 ++++-----
 .../test/TrigT2MbtsBitsCnv_p2_test.cxx                   | 9 ++++-----
 .../test/TrigT2MbtsBitsCnv_p3_test.cxx                   | 9 ++++-----
 .../test/TrigT2ZdcSignalsCnv_p1_test.cxx                 | 9 ++++-----
 .../test/TrigTauClusterCnv_p2_test.cxx                   | 7 ++++---
 .../test/TrigTauClusterCnv_p3_test.cxx                   | 7 ++++---
 .../test/TrigTauClusterCnv_p4_test.cxx                   | 7 ++++---
 .../test/TrigTauClusterCnv_p5_test.cxx                   | 7 ++++---
 .../test/TrigTauClusterDetailsCnv_p1_test.cxx            | 9 ++++-----
 .../test/TrigTauClusterDetailsCnv_p2_test.cxx            | 9 ++++-----
 24 files changed, 91 insertions(+), 94 deletions(-)
 create mode 100644 Trigger/TrigEvent/TrigCaloEventTPCnv/TrigCaloEventTPCnv/ATLAS_CHECK_THREAD_SAFETY

diff --git a/Trigger/TrigEvent/TrigCaloEventTPCnv/CMakeLists.txt b/Trigger/TrigEvent/TrigCaloEventTPCnv/CMakeLists.txt
index ba41fe0ef3c1..1ebdb2b36edd 100644
--- a/Trigger/TrigEvent/TrigCaloEventTPCnv/CMakeLists.txt
+++ b/Trigger/TrigEvent/TrigCaloEventTPCnv/CMakeLists.txt
@@ -1,4 +1,4 @@
-# Copyright (C) 2002-2020 CERN for the benefit of the ATLAS collaboration
+# Copyright (C) 2002-2022 CERN for the benefit of the ATLAS collaboration
 
 # Declare the package name:
 atlas_subdir( TrigCaloEventTPCnv )
@@ -20,7 +20,7 @@ function( _add_test test )
    atlas_add_test( ${test}
                    SOURCES
                    test/${test}.cxx
-                   LINK_LIBRARIES TestTools TrigCaloEventTPCnv )
+                   LINK_LIBRARIES TestTools TrigCaloEventTPCnv CxxUtils )
 endfunction()
 
 _add_test( TrigCaloClusterCnv_p1_test )
diff --git a/Trigger/TrigEvent/TrigCaloEventTPCnv/TrigCaloEventTPCnv/ATLAS_CHECK_THREAD_SAFETY b/Trigger/TrigEvent/TrigCaloEventTPCnv/TrigCaloEventTPCnv/ATLAS_CHECK_THREAD_SAFETY
new file mode 100644
index 000000000000..242f534b24c5
--- /dev/null
+++ b/Trigger/TrigEvent/TrigCaloEventTPCnv/TrigCaloEventTPCnv/ATLAS_CHECK_THREAD_SAFETY
@@ -0,0 +1 @@
+Trigger/TrigEvent/TrigCaloEventTPCnv
diff --git a/Trigger/TrigEvent/TrigCaloEventTPCnv/test/RingerRingsCnv_p1_test.cxx b/Trigger/TrigEvent/TrigCaloEventTPCnv/test/RingerRingsCnv_p1_test.cxx
index e85283178c39..a8b2014c5db2 100644
--- a/Trigger/TrigEvent/TrigCaloEventTPCnv/test/RingerRingsCnv_p1_test.cxx
+++ b/Trigger/TrigEvent/TrigCaloEventTPCnv/test/RingerRingsCnv_p1_test.cxx
@@ -1,8 +1,6 @@
 /*
-  Copyright (C) 2002-2017 CERN for the benefit of the ATLAS collaboration
+  Copyright (C) 2002-2022 CERN for the benefit of the ATLAS collaboration
 */
-
-// $Id$
 /**
  * @file TrigCaloEventTPCnv/test/RingerRingsCnv_p1_test.cxx
  * @author scott snyder <snyder@bnl.gov>
@@ -14,6 +12,7 @@
 #undef NDEBUG
 #include "TrigCaloEventTPCnv/RingerRingsCnv_p1.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 RingerRings& trans1)
 }
 
 
-void test1()
+void test1 ATLAS_NOT_THREAD_SAFE ()
 {
   std::cout << "test1\n";
   Athena_test::Leakcheck check;
@@ -49,7 +48,7 @@ void test1()
 }
 
 
-int main()
+int main ATLAS_NOT_THREAD_SAFE ()
 {
   test1();
   return 0;
diff --git a/Trigger/TrigEvent/TrigCaloEventTPCnv/test/RingerRingsCnv_p2_test.cxx b/Trigger/TrigEvent/TrigCaloEventTPCnv/test/RingerRingsCnv_p2_test.cxx
index c0e8e807962f..06cd330742e7 100644
--- a/Trigger/TrigEvent/TrigCaloEventTPCnv/test/RingerRingsCnv_p2_test.cxx
+++ b/Trigger/TrigEvent/TrigCaloEventTPCnv/test/RingerRingsCnv_p2_test.cxx
@@ -1,8 +1,6 @@
 /*
-  Copyright (C) 2002-2017 CERN for the benefit of the ATLAS collaboration
+  Copyright (C) 2002-2022 CERN for the benefit of the ATLAS collaboration
 */
-
-// $Id$
 /**
  * @file TrigCaloEventTPCnv/test/RingerRingsCnv_p2_test.cxx
  * @author scott snyder <snyder@bnl.gov>
@@ -14,6 +12,7 @@
 #undef NDEBUG
 #include "TrigCaloEventTPCnv/RingerRingsCnv_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 RingerRings& trans1)
 }
 
 
-void test1()
+void test1 ATLAS_NOT_THREAD_SAFE ()
 {
   std::cout << "test1\n";
   Athena_test::Leakcheck check;
@@ -49,7 +48,7 @@ void test1()
 }
 
 
-int main()
+int main ATLAS_NOT_THREAD_SAFE ()
 {
   test1();
   return 0;
diff --git a/Trigger/TrigEvent/TrigCaloEventTPCnv/test/TrigCaloClusterCnv_p1_test.cxx b/Trigger/TrigEvent/TrigCaloEventTPCnv/test/TrigCaloClusterCnv_p1_test.cxx
index 4372648e6f2c..2ae3906e1ff7 100644
--- a/Trigger/TrigEvent/TrigCaloEventTPCnv/test/TrigCaloClusterCnv_p1_test.cxx
+++ b/Trigger/TrigEvent/TrigCaloEventTPCnv/test/TrigCaloClusterCnv_p1_test.cxx
@@ -1,8 +1,6 @@
 /*
-  Copyright (C) 2002-2017 CERN for the benefit of the ATLAS collaboration
+  Copyright (C) 2002-2022 CERN for the benefit of the ATLAS collaboration
 */
-
-// $Id$
 /**
  * @file TrigCaloEventTPCnv/test/TrigCaloClusterCnv_p1_test.cxx
  * @author scott snyder <snyder@bnl.gov>
@@ -15,12 +13,13 @@
 #include "TrigCaloEventTPCnv/TrigCaloCluster_p1.h"
 #include "TrigCaloEvent/TrigCaloCluster.h"
 #include "TestTools/leakcheck.h"
+#include "CxxUtils/checker_macros.h"
 #include "GaudiKernel/MsgStream.h"
 #include <iostream>
 #include <cassert>
 
 
-void test1()
+void test1 ATLAS_NOT_THREAD_SAFE ()
 {
   MsgStream log (0, "test");
   std::cout << "test1\n";
@@ -58,7 +57,7 @@ void test1()
 }
 
 
-int main()
+int main ATLAS_NOT_THREAD_SAFE ()
 {
   test1();
   return 0;
diff --git a/Trigger/TrigEvent/TrigCaloEventTPCnv/test/TrigCaloClusterCnv_p2_test.cxx b/Trigger/TrigEvent/TrigCaloEventTPCnv/test/TrigCaloClusterCnv_p2_test.cxx
index 7dc4ec5d280b..2e7fac9c5af3 100644
--- a/Trigger/TrigEvent/TrigCaloEventTPCnv/test/TrigCaloClusterCnv_p2_test.cxx
+++ b/Trigger/TrigEvent/TrigCaloEventTPCnv/test/TrigCaloClusterCnv_p2_test.cxx
@@ -1,8 +1,6 @@
 /*
-  Copyright (C) 2002-2017 CERN for the benefit of the ATLAS collaboration
+  Copyright (C) 2002-2022 CERN for the benefit of the ATLAS collaboration
 */
-
-// $Id$
 /**
  * @file TrigCaloEventTPCnv/test/TrigCaloClusterCnv_p2_test.cxx
  * @author scott snyder <snyder@bnl.gov>
@@ -15,12 +13,13 @@
 #include "TrigCaloEventTPCnv/TrigCaloCluster_p2.h"
 #include "TrigCaloEvent/TrigCaloCluster.h"
 #include "TestTools/leakcheck.h"
+#include "CxxUtils/checker_macros.h"
 #include "GaudiKernel/MsgStream.h"
 #include <iostream>
 #include <cassert>
 
 
-void test1()
+void test1 ATLAS_NOT_THREAD_SAFE ()
 {
   MsgStream log (0, "test");
   std::cout << "test1\n";
@@ -58,7 +57,7 @@ void test1()
 }
 
 
-int main()
+int main ATLAS_NOT_THREAD_SAFE ()
 {
   test1();
   return 0;
diff --git a/Trigger/TrigEvent/TrigCaloEventTPCnv/test/TrigCaloClusterCnv_p3_test.cxx b/Trigger/TrigEvent/TrigCaloEventTPCnv/test/TrigCaloClusterCnv_p3_test.cxx
index b60e2bbc9d3d..2fe7591fb060 100644
--- a/Trigger/TrigEvent/TrigCaloEventTPCnv/test/TrigCaloClusterCnv_p3_test.cxx
+++ b/Trigger/TrigEvent/TrigCaloEventTPCnv/test/TrigCaloClusterCnv_p3_test.cxx
@@ -1,8 +1,6 @@
 /*
-  Copyright (C) 2002-2017 CERN for the benefit of the ATLAS collaboration
+  Copyright (C) 2002-2022 CERN for the benefit of the ATLAS collaboration
 */
-
-// $Id$
 /**
  * @file TrigCaloEventTPCnv/test/TrigCaloClusterCnv_p3_test.cxx
  * @author scott snyder <snyder@bnl.gov>
@@ -15,12 +13,13 @@
 #include "TrigCaloEventTPCnv/TrigCaloCluster_p3.h"
 #include "TrigCaloEvent/TrigCaloCluster.h"
 #include "TestTools/leakcheck.h"
+#include "CxxUtils/checker_macros.h"
 #include "GaudiKernel/MsgStream.h"
 #include <iostream>
 #include <cassert>
 
 
-void test1()
+void test1 ATLAS_NOT_THREAD_SAFE ()
 {
   MsgStream log (0, "test");
   std::cout << "test1\n";
@@ -58,7 +57,7 @@ void test1()
 }
 
 
-int main()
+int main ATLAS_NOT_THREAD_SAFE ()
 {
   test1();
   return 0;
diff --git a/Trigger/TrigEvent/TrigCaloEventTPCnv/test/TrigEMClusterCnv_p2_test.cxx b/Trigger/TrigEvent/TrigCaloEventTPCnv/test/TrigEMClusterCnv_p2_test.cxx
index dfda9f48a3fa..b93b4c90da23 100644
--- a/Trigger/TrigEvent/TrigCaloEventTPCnv/test/TrigEMClusterCnv_p2_test.cxx
+++ b/Trigger/TrigEvent/TrigCaloEventTPCnv/test/TrigEMClusterCnv_p2_test.cxx
@@ -1,5 +1,5 @@
 /*
-  Copyright (C) 2002-2021 CERN for the benefit of the ATLAS collaboration
+  Copyright (C) 2002-2022 CERN for the benefit of the ATLAS collaboration
 */
 /**
  * @file TrigCaloEventTPCnv/test/TrigEMClusterCnv_p2_test.cxx
@@ -14,6 +14,7 @@
 #include "TrigCaloEventTPCnv/TrigEMClusterCnv_tlp2.h"
 #include "SGTools/TestStore.h"
 #include "TestTools/leakcheck.h"
+#include "CxxUtils/checker_macros.h"
 #include "GaudiKernel/MsgStream.h"
 #include "GaudiKernel/ThreadLocalContext.h"
 #include <cassert>
@@ -79,7 +80,7 @@ void testit (const TrigEMCluster& trans1)
 }
 
 
-void test1()
+void test1 ATLAS_NOT_THREAD_SAFE ()
 {
   std::cout << "test1\n";
   (void)Gaudi::Hive::currentContext();
@@ -117,7 +118,7 @@ void test1()
 }
 
 
-int main()
+int main ATLAS_NOT_THREAD_SAFE ()
 {
   SGTest::initTestStore();
   test1();
diff --git a/Trigger/TrigEvent/TrigCaloEventTPCnv/test/TrigEMClusterCnv_p3_test.cxx b/Trigger/TrigEvent/TrigCaloEventTPCnv/test/TrigEMClusterCnv_p3_test.cxx
index 79b5fb46756e..5a62aa29589a 100644
--- a/Trigger/TrigEvent/TrigCaloEventTPCnv/test/TrigEMClusterCnv_p3_test.cxx
+++ b/Trigger/TrigEvent/TrigCaloEventTPCnv/test/TrigEMClusterCnv_p3_test.cxx
@@ -1,5 +1,5 @@
 /*
-  Copyright (C) 2002-2021 CERN for the benefit of the ATLAS collaboration
+  Copyright (C) 2002-2022 CERN for the benefit of the ATLAS collaboration
 */
 /**
  * @file TrigCaloEventTPCnv/test/TrigEMClusterCnv_p3_test.cxx
@@ -13,6 +13,7 @@
 #include "TrigCaloEventTPCnv/TrigEMClusterCnv_p3.h"
 #include "SGTools/TestStore.h"
 #include "TestTools/leakcheck.h"
+#include "CxxUtils/checker_macros.h"
 #include "GaudiKernel/MsgStream.h"
 #include "GaudiKernel/ThreadLocalContext.h"
 #include <cassert>
@@ -76,7 +77,7 @@ void testit (const TrigEMCluster& trans1)
 }
 
 
-void test1()
+void test1 ATLAS_NOT_THREAD_SAFE ()
 {
   std::cout << "test1\n";
   (void)Gaudi::Hive::currentContext();
@@ -114,7 +115,7 @@ void test1()
 }
 
 
-int main()
+int main ATLAS_NOT_THREAD_SAFE ()
 {
   SGTest::initTestStore();
   test1();
diff --git a/Trigger/TrigEvent/TrigCaloEventTPCnv/test/TrigEMClusterCnv_p4_test.cxx b/Trigger/TrigEvent/TrigCaloEventTPCnv/test/TrigEMClusterCnv_p4_test.cxx
index d4eab9e58cd6..72b6ecaa44fe 100644
--- a/Trigger/TrigEvent/TrigCaloEventTPCnv/test/TrigEMClusterCnv_p4_test.cxx
+++ b/Trigger/TrigEvent/TrigCaloEventTPCnv/test/TrigEMClusterCnv_p4_test.cxx
@@ -1,5 +1,5 @@
 /*
-  Copyright (C) 2002-2021 CERN for the benefit of the ATLAS collaboration
+  Copyright (C) 2002-2022 CERN for the benefit of the ATLAS collaboration
 */
 /**
  * @file TrigCaloEventTPCnv/test/TrigEMClusterCnv_p4_test.cxx
@@ -13,6 +13,7 @@
 #include "TrigCaloEventTPCnv/TrigEMClusterCnv_p4.h"
 #include "SGTools/TestStore.h"
 #include "TestTools/leakcheck.h"
+#include "CxxUtils/checker_macros.h"
 #include "GaudiKernel/MsgStream.h"
 #include "GaudiKernel/ThreadLocalContext.h"
 #include <cassert>
@@ -76,7 +77,7 @@ void testit (const TrigEMCluster& trans1)
 }
 
 
-void test1()
+void test1 ATLAS_NOT_THREAD_SAFE ()
 {
   std::cout << "test1\n";
   (void)Gaudi::Hive::currentContext();
@@ -114,7 +115,7 @@ void test1()
 }
 
 
-int main()
+int main ATLAS_NOT_THREAD_SAFE ()
 {
   SGTest::initTestStore();
   test1();
diff --git a/Trigger/TrigEvent/TrigCaloEventTPCnv/test/TrigRNNOutputCnv_p1_test.cxx b/Trigger/TrigEvent/TrigCaloEventTPCnv/test/TrigRNNOutputCnv_p1_test.cxx
index e30f35ac889e..1a82a217a554 100644
--- a/Trigger/TrigEvent/TrigCaloEventTPCnv/test/TrigRNNOutputCnv_p1_test.cxx
+++ b/Trigger/TrigEvent/TrigCaloEventTPCnv/test/TrigRNNOutputCnv_p1_test.cxx
@@ -1,5 +1,5 @@
 /*
-  Copyright (C) 2002-2021 CERN for the benefit of the ATLAS collaboration
+  Copyright (C) 2002-2022 CERN for the benefit of the ATLAS collaboration
 */
 /**
  * @file TrigCaloEventTPCnv/test/TrigRNNOutputCnv_p1_test.cxx
@@ -13,6 +13,7 @@
 #include "TrigCaloEventTPCnv/TrigRNNOutputCnv_p1.h"
 #include "SGTools/TestStore.h"
 #include "TestTools/leakcheck.h"
+#include "CxxUtils/checker_macros.h"
 #include "GaudiKernel/MsgStream.h"
 #include "GaudiKernel/ThreadLocalContext.h"
 #include <cassert>
@@ -40,7 +41,7 @@ void testit (const TrigRNNOutput& trans1)
 }
 
 
-void test1()
+void test1 ATLAS_NOT_THREAD_SAFE ()
 {
   std::cout << "test1\n";
   (void)Gaudi::Hive::currentContext();
@@ -55,7 +56,7 @@ void test1()
 }
 
 
-int main()
+int main ATLAS_NOT_THREAD_SAFE ()
 {
   SGTest::initTestStore();
   test1();
diff --git a/Trigger/TrigEvent/TrigCaloEventTPCnv/test/TrigRNNOutputCnv_p2_test.cxx b/Trigger/TrigEvent/TrigCaloEventTPCnv/test/TrigRNNOutputCnv_p2_test.cxx
index c59835775b67..b3b3b91e62d9 100644
--- a/Trigger/TrigEvent/TrigCaloEventTPCnv/test/TrigRNNOutputCnv_p2_test.cxx
+++ b/Trigger/TrigEvent/TrigCaloEventTPCnv/test/TrigRNNOutputCnv_p2_test.cxx
@@ -1,5 +1,5 @@
 /*
-  Copyright (C) 2002-2021 CERN for the benefit of the ATLAS collaboration
+  Copyright (C) 2002-2022 CERN for the benefit of the ATLAS collaboration
 */
 /**
  * @file TrigCaloEventTPCnv/test/TrigRNNOutputCnv_p2_test.cxx
@@ -13,6 +13,7 @@
 #include "TrigCaloEventTPCnv/TrigRNNOutputCnv_p2.h"
 #include "SGTools/TestStore.h"
 #include "TestTools/leakcheck.h"
+#include "CxxUtils/checker_macros.h"
 #include "GaudiKernel/MsgStream.h"
 #include "GaudiKernel/ThreadLocalContext.h"
 #include <cassert>
@@ -40,7 +41,7 @@ void testit (const TrigRNNOutput& trans1)
 }
 
 
-void test1()
+void test1 ATLAS_NOT_THREAD_SAFE ()
 {
   std::cout << "test1\n";
   (void)Gaudi::Hive::currentContext();
@@ -55,7 +56,7 @@ void test1()
 }
 
 
-int main()
+int main ATLAS_NOT_THREAD_SAFE ()
 {
   SGTest::initTestStore();
   test1();
diff --git a/Trigger/TrigEvent/TrigCaloEventTPCnv/test/TrigT2JetCnv_p2_test.cxx b/Trigger/TrigEvent/TrigCaloEventTPCnv/test/TrigT2JetCnv_p2_test.cxx
index cb29daf52b74..537a6a40b517 100644
--- a/Trigger/TrigEvent/TrigCaloEventTPCnv/test/TrigT2JetCnv_p2_test.cxx
+++ b/Trigger/TrigEvent/TrigCaloEventTPCnv/test/TrigT2JetCnv_p2_test.cxx
@@ -1,8 +1,6 @@
 /*
-  Copyright (C) 2002-2019 CERN for the benefit of the ATLAS collaboration
+  Copyright (C) 2002-2022 CERN for the benefit of the ATLAS collaboration
 */
-
-// $Id$
 /**
  * @file TrigCaloEventTPCnv/test/TrigT2JetCnv_p2_test.cxx
  * @author scott snyder <snyder@bnl.gov>
@@ -15,6 +13,7 @@
 #include "TrigCaloEvent/TrigT2Jet.h"
 #include "TrigCaloEventTPCnv/TrigT2JetCnv_p2.h"
 #include "TestTools/leakcheck.h"
+#include "CxxUtils/checker_macros.h"
 #include "GaudiKernel/MsgStream.h"
 #include "CLHEP/Vector/ThreeVector.h"
 #include <cassert>
@@ -69,7 +68,7 @@ void testit (const TrigT2Jet& trans1)
 }
 
 
-void test1()
+void test1 ATLAS_NOT_THREAD_SAFE ()
 {
   std::cout << "test1\n";
   Athena_test::Leakcheck check;
@@ -96,7 +95,7 @@ void test1()
 }
 
 
-int main()
+int main ATLAS_NOT_THREAD_SAFE ()
 {
   test1();
   return 0;
diff --git a/Trigger/TrigEvent/TrigCaloEventTPCnv/test/TrigT2JetCnv_p3_test.cxx b/Trigger/TrigEvent/TrigCaloEventTPCnv/test/TrigT2JetCnv_p3_test.cxx
index dd312db27728..4dfe490468b3 100644
--- a/Trigger/TrigEvent/TrigCaloEventTPCnv/test/TrigT2JetCnv_p3_test.cxx
+++ b/Trigger/TrigEvent/TrigCaloEventTPCnv/test/TrigT2JetCnv_p3_test.cxx
@@ -1,8 +1,6 @@
 /*
-  Copyright (C) 2002-2019 CERN for the benefit of the ATLAS collaboration
+  Copyright (C) 2002-2022 CERN for the benefit of the ATLAS collaboration
 */
-
-// $Id$
 /**
  * @file TrigCaloEventTPCnv/test/TrigT2JetCnv_p3_test.cxx
  * @author scott snyder <snyder@bnl.gov>
@@ -15,6 +13,7 @@
 #include "TrigCaloEvent/TrigT2Jet.h"
 #include "TrigCaloEventTPCnv/TrigT2JetCnv_p3.h"
 #include "TestTools/leakcheck.h"
+#include "CxxUtils/checker_macros.h"
 #include "GaudiKernel/MsgStream.h"
 #include "CLHEP/Vector/ThreeVector.h"
 #include <cassert>
@@ -69,7 +68,7 @@ void testit (const TrigT2Jet& trans1)
 }
 
 
-void test1()
+void test1 ATLAS_NOT_THREAD_SAFE ()
 {
   std::cout << "test1\n";
   Athena_test::Leakcheck check;
@@ -96,7 +95,7 @@ void test1()
 }
 
 
-int main()
+int main ATLAS_NOT_THREAD_SAFE ()
 {
   test1();
   return 0;
diff --git a/Trigger/TrigEvent/TrigCaloEventTPCnv/test/TrigT2MbtsBitsCnv_p1_test.cxx b/Trigger/TrigEvent/TrigCaloEventTPCnv/test/TrigT2MbtsBitsCnv_p1_test.cxx
index e9cc710913b0..444a730f67cc 100644
--- a/Trigger/TrigEvent/TrigCaloEventTPCnv/test/TrigT2MbtsBitsCnv_p1_test.cxx
+++ b/Trigger/TrigEvent/TrigCaloEventTPCnv/test/TrigT2MbtsBitsCnv_p1_test.cxx
@@ -1,8 +1,6 @@
 /*
-  Copyright (C) 2002-2017 CERN for the benefit of the ATLAS collaboration
+  Copyright (C) 2002-2022 CERN for the benefit of the ATLAS collaboration
 */
-
-// $Id$
 /**
  * @file TrigCaloEventTPCnv/test/TrigT2MbtsBitsCnv_p1_test.cxx
  * @author scott snyder <snyder@bnl.gov>
@@ -14,6 +12,7 @@
 #undef NDEBUG
 #include "TrigCaloEventTPCnv/TrigT2MbtsBitsCnv_p1.h"
 #include "TestTools/leakcheck.h"
+#include "CxxUtils/checker_macros.h"
 #include "GaudiKernel/MsgStream.h"
 #include <cassert>
 #include <iostream>
@@ -41,7 +40,7 @@ void testit (const TrigT2MbtsBits& trans1)
 }
 
 
-void test1()
+void test1 ATLAS_NOT_THREAD_SAFE ()
 {
   std::cout << "test1\n";
   Athena_test::Leakcheck check;
@@ -53,7 +52,7 @@ void test1()
 }
 
 
-int main()
+int main ATLAS_NOT_THREAD_SAFE ()
 {
   test1();
   return 0;
diff --git a/Trigger/TrigEvent/TrigCaloEventTPCnv/test/TrigT2MbtsBitsCnv_p2_test.cxx b/Trigger/TrigEvent/TrigCaloEventTPCnv/test/TrigT2MbtsBitsCnv_p2_test.cxx
index c81974c71a31..c330e57b6431 100644
--- a/Trigger/TrigEvent/TrigCaloEventTPCnv/test/TrigT2MbtsBitsCnv_p2_test.cxx
+++ b/Trigger/TrigEvent/TrigCaloEventTPCnv/test/TrigT2MbtsBitsCnv_p2_test.cxx
@@ -1,8 +1,6 @@
 /*
-  Copyright (C) 2002-2017 CERN for the benefit of the ATLAS collaboration
+  Copyright (C) 2002-2022 CERN for the benefit of the ATLAS collaboration
 */
-
-// $Id$
 /**
  * @file TrigCaloEventTPCnv/test/TrigT2MbtsBitsCnv_p2_test.cxx
  * @author scott snyder <snyder@bnl.gov>
@@ -14,6 +12,7 @@
 #undef NDEBUG
 #include "TrigCaloEventTPCnv/TrigT2MbtsBitsCnv_p2.h"
 #include "TestTools/leakcheck.h"
+#include "CxxUtils/checker_macros.h"
 #include "GaudiKernel/MsgStream.h"
 #include <cassert>
 #include <iostream>
@@ -40,7 +39,7 @@ void testit (const TrigT2MbtsBits& trans1)
 }
 
 
-void test1()
+void test1 ATLAS_NOT_THREAD_SAFE ()
 {
   std::cout << "test1\n";
   Athena_test::Leakcheck check;
@@ -52,7 +51,7 @@ void test1()
 }
 
 
-int main()
+int main ATLAS_NOT_THREAD_SAFE ()
 {
   test1();
   return 0;
diff --git a/Trigger/TrigEvent/TrigCaloEventTPCnv/test/TrigT2MbtsBitsCnv_p3_test.cxx b/Trigger/TrigEvent/TrigCaloEventTPCnv/test/TrigT2MbtsBitsCnv_p3_test.cxx
index a64229e07a0b..9174d0c334d8 100644
--- a/Trigger/TrigEvent/TrigCaloEventTPCnv/test/TrigT2MbtsBitsCnv_p3_test.cxx
+++ b/Trigger/TrigEvent/TrigCaloEventTPCnv/test/TrigT2MbtsBitsCnv_p3_test.cxx
@@ -1,8 +1,6 @@
 /*
-  Copyright (C) 2002-2017 CERN for the benefit of the ATLAS collaboration
+  Copyright (C) 2002-2022 CERN for the benefit of the ATLAS collaboration
 */
-
-// $Id$
 /**
  * @file TrigCaloEventTPCnv/test/TrigT2MbtsBitsCnv_p3_test.cxx
  * @author scott snyder <snyder@bnl.gov>
@@ -14,6 +12,7 @@
 #undef NDEBUG
 #include "TrigCaloEventTPCnv/TrigT2MbtsBitsCnv_p3.h"
 #include "TestTools/leakcheck.h"
+#include "CxxUtils/checker_macros.h"
 #include "GaudiKernel/MsgStream.h"
 #include <cassert>
 #include <iostream>
@@ -40,7 +39,7 @@ void testit (const TrigT2MbtsBits& trans1)
 }
 
 
-void test1()
+void test1 ATLAS_NOT_THREAD_SAFE ()
 {
   std::cout << "test1\n";
   Athena_test::Leakcheck check;
@@ -52,7 +51,7 @@ void test1()
 }
 
 
-int main()
+int main ATLAS_NOT_THREAD_SAFE ()
 {
   test1();
   return 0;
diff --git a/Trigger/TrigEvent/TrigCaloEventTPCnv/test/TrigT2ZdcSignalsCnv_p1_test.cxx b/Trigger/TrigEvent/TrigCaloEventTPCnv/test/TrigT2ZdcSignalsCnv_p1_test.cxx
index 9cf05d5b77d0..2f08364b02fa 100644
--- a/Trigger/TrigEvent/TrigCaloEventTPCnv/test/TrigT2ZdcSignalsCnv_p1_test.cxx
+++ b/Trigger/TrigEvent/TrigCaloEventTPCnv/test/TrigT2ZdcSignalsCnv_p1_test.cxx
@@ -1,8 +1,6 @@
 /*
-  Copyright (C) 2002-2017 CERN for the benefit of the ATLAS collaboration
+  Copyright (C) 2002-2022 CERN for the benefit of the ATLAS collaboration
 */
-
-// $Id$
 /**
  * @file TrigCaloEventTPCnv/test/TrigT2ZdcSignalsCnv_p1_test.cxx
  * @author scott snyder <snyder@bnl.gov>
@@ -14,6 +12,7 @@
 #undef NDEBUG
 #include "TrigCaloEventTPCnv/TrigT2ZdcSignalsCnv_p1.h"
 #include "TestTools/leakcheck.h"
+#include "CxxUtils/checker_macros.h"
 #include "GaudiKernel/MsgStream.h"
 #include <cassert>
 #include <iostream>
@@ -40,7 +39,7 @@ void testit (const TrigT2ZdcSignals& trans1)
 }
 
 
-void test1()
+void test1 ATLAS_NOT_THREAD_SAFE ()
 {
   std::cout << "test1\n";
   Athena_test::Leakcheck check;
@@ -52,7 +51,7 @@ void test1()
 }
 
 
-int main()
+int main ATLAS_NOT_THREAD_SAFE ()
 {
   test1();
   return 0;
diff --git a/Trigger/TrigEvent/TrigCaloEventTPCnv/test/TrigTauClusterCnv_p2_test.cxx b/Trigger/TrigEvent/TrigCaloEventTPCnv/test/TrigTauClusterCnv_p2_test.cxx
index 47e8f8775af3..9ce321d537eb 100644
--- a/Trigger/TrigEvent/TrigCaloEventTPCnv/test/TrigTauClusterCnv_p2_test.cxx
+++ b/Trigger/TrigEvent/TrigCaloEventTPCnv/test/TrigTauClusterCnv_p2_test.cxx
@@ -1,5 +1,5 @@
 /*
-  Copyright (C) 2002-2021 CERN for the benefit of the ATLAS collaboration
+  Copyright (C) 2002-2022 CERN for the benefit of the ATLAS collaboration
 */
 /**
  * @file TrigCaloEventTPCnv/test/TrigTauClusterCnv_p2_test.cxx
@@ -14,6 +14,7 @@
 #include "TrigCaloEventTPCnv/TrigTauClusterCnv_tlp1.h"
 #include "SGTools/TestStore.h"
 #include "TestTools/leakcheck.h"
+#include "CxxUtils/checker_macros.h"
 #include "GaudiKernel/MsgStream.h"
 #include "GaudiKernel/ThreadLocalContext.h"
 #include <cassert>
@@ -80,7 +81,7 @@ void testit (const TrigTauCluster& trans1)
 }
 
 
-void test1()
+void test1 ATLAS_NOT_THREAD_SAFE ()
 {
   std::cout << "test1\n";
   (void)Gaudi::Hive::currentContext();
@@ -121,7 +122,7 @@ void test1()
 }
 
 
-int main()
+int main ATLAS_NOT_THREAD_SAFE ()
 {
   SGTest::initTestStore();
   test1();
diff --git a/Trigger/TrigEvent/TrigCaloEventTPCnv/test/TrigTauClusterCnv_p3_test.cxx b/Trigger/TrigEvent/TrigCaloEventTPCnv/test/TrigTauClusterCnv_p3_test.cxx
index d998ca712880..d0375f1445db 100644
--- a/Trigger/TrigEvent/TrigCaloEventTPCnv/test/TrigTauClusterCnv_p3_test.cxx
+++ b/Trigger/TrigEvent/TrigCaloEventTPCnv/test/TrigTauClusterCnv_p3_test.cxx
@@ -1,5 +1,5 @@
 /*
-  Copyright (C) 2002-2021 CERN for the benefit of the ATLAS collaboration
+  Copyright (C) 2002-2022 CERN for the benefit of the ATLAS collaboration
 */
 /**
  * @file TrigCaloEventTPCnv/test/TrigTauClusterCnv_p3_test.cxx
@@ -13,6 +13,7 @@
 #include "TrigCaloEventTPCnv/TrigTauClusterCnv_p3.h"
 #include "SGTools/TestStore.h"
 #include "TestTools/leakcheck.h"
+#include "CxxUtils/checker_macros.h"
 #include "GaudiKernel/MsgStream.h"
 #include "GaudiKernel/ThreadLocalContext.h"
 #include <cassert>
@@ -77,7 +78,7 @@ void testit (const TrigTauCluster& trans1)
 }
 
 
-void test1()
+void test1 ATLAS_NOT_THREAD_SAFE ()
 {
   std::cout << "test1\n";
   (void)Gaudi::Hive::currentContext();
@@ -118,7 +119,7 @@ void test1()
 }
 
 
-int main()
+int main ATLAS_NOT_THREAD_SAFE ()
 {
   SGTest::initTestStore();
   test1();
diff --git a/Trigger/TrigEvent/TrigCaloEventTPCnv/test/TrigTauClusterCnv_p4_test.cxx b/Trigger/TrigEvent/TrigCaloEventTPCnv/test/TrigTauClusterCnv_p4_test.cxx
index 34fdbac9c52d..1b0354db8b75 100644
--- a/Trigger/TrigEvent/TrigCaloEventTPCnv/test/TrigTauClusterCnv_p4_test.cxx
+++ b/Trigger/TrigEvent/TrigCaloEventTPCnv/test/TrigTauClusterCnv_p4_test.cxx
@@ -1,5 +1,5 @@
 /*
-  Copyright (C) 2002-2021 CERN for the benefit of the ATLAS collaboration
+  Copyright (C) 2002-2022 CERN for the benefit of the ATLAS collaboration
 */
 /**
  * @file TrigCaloEventTPCnv/test/TrigTauClusterCnv_p4_test.cxx
@@ -13,6 +13,7 @@
 #include "TrigCaloEventTPCnv/TrigTauClusterCnv_p4.h"
 #include "SGTools/TestStore.h"
 #include "TestTools/leakcheck.h"
+#include "CxxUtils/checker_macros.h"
 #include "GaudiKernel/MsgStream.h"
 #include "GaudiKernel/ThreadLocalContext.h"
 #include <cassert>
@@ -74,7 +75,7 @@ void testit (const TrigTauCluster& trans1)
 }
 
 
-void test1()
+void test1 ATLAS_NOT_THREAD_SAFE ()
 {
   std::cout << "test1\n";
   (void)Gaudi::Hive::currentContext();
@@ -115,7 +116,7 @@ void test1()
 }
 
 
-int main()
+int main ATLAS_NOT_THREAD_SAFE ()
 {
   SGTest::initTestStore();
   test1();
diff --git a/Trigger/TrigEvent/TrigCaloEventTPCnv/test/TrigTauClusterCnv_p5_test.cxx b/Trigger/TrigEvent/TrigCaloEventTPCnv/test/TrigTauClusterCnv_p5_test.cxx
index 301810f63519..d74443c4b838 100644
--- a/Trigger/TrigEvent/TrigCaloEventTPCnv/test/TrigTauClusterCnv_p5_test.cxx
+++ b/Trigger/TrigEvent/TrigCaloEventTPCnv/test/TrigTauClusterCnv_p5_test.cxx
@@ -1,5 +1,5 @@
 /*
-  Copyright (C) 2002-2021 CERN for the benefit of the ATLAS collaboration
+  Copyright (C) 2002-2022 CERN for the benefit of the ATLAS collaboration
 */
 /**
  * @file TrigCaloEventTPCnv/test/TrigTauClusterCnv_p5_test.cxx
@@ -13,6 +13,7 @@
 #include "TrigCaloEventTPCnv/TrigTauClusterCnv_p5.h"
 #include "SGTools/TestStore.h"
 #include "TestTools/leakcheck.h"
+#include "CxxUtils/checker_macros.h"
 #include "GaudiKernel/MsgStream.h"
 #include "GaudiKernel/ThreadLocalContext.h"
 #include <cassert>
@@ -73,7 +74,7 @@ void testit (const TrigTauCluster& trans1)
 }
 
 
-void test1()
+void test1 ATLAS_NOT_THREAD_SAFE ()
 {
   std::cout << "test1\n";
   (void)Gaudi::Hive::currentContext();
@@ -114,7 +115,7 @@ void test1()
 }
 
 
-int main()
+int main ATLAS_NOT_THREAD_SAFE ()
 {
   SGTest::initTestStore();
   test1();
diff --git a/Trigger/TrigEvent/TrigCaloEventTPCnv/test/TrigTauClusterDetailsCnv_p1_test.cxx b/Trigger/TrigEvent/TrigCaloEventTPCnv/test/TrigTauClusterDetailsCnv_p1_test.cxx
index f77cd01d5fe4..bc1a387b9dde 100644
--- a/Trigger/TrigEvent/TrigCaloEventTPCnv/test/TrigTauClusterDetailsCnv_p1_test.cxx
+++ b/Trigger/TrigEvent/TrigCaloEventTPCnv/test/TrigTauClusterDetailsCnv_p1_test.cxx
@@ -1,8 +1,6 @@
 /*
-  Copyright (C) 2002-2017 CERN for the benefit of the ATLAS collaboration
+  Copyright (C) 2002-2022 CERN for the benefit of the ATLAS collaboration
 */
-
-// $Id$
 /**
  * @file TrigCaloEventTPCnv/test/TrigTauClusterDetailsCnv_p1_test.cxx
  * @author scott snyder <snyder@bnl.gov>
@@ -14,6 +12,7 @@
 #undef NDEBUG
 #include "TrigCaloEventTPCnv/TrigTauClusterDetailsCnv_p1.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 TrigTauClusterDetails& 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/Trigger/TrigEvent/TrigCaloEventTPCnv/test/TrigTauClusterDetailsCnv_p2_test.cxx b/Trigger/TrigEvent/TrigCaloEventTPCnv/test/TrigTauClusterDetailsCnv_p2_test.cxx
index afaf22affedf..5f66cf65a029 100644
--- a/Trigger/TrigEvent/TrigCaloEventTPCnv/test/TrigTauClusterDetailsCnv_p2_test.cxx
+++ b/Trigger/TrigEvent/TrigCaloEventTPCnv/test/TrigTauClusterDetailsCnv_p2_test.cxx
@@ -1,8 +1,6 @@
 /*
-  Copyright (C) 2002-2017 CERN for the benefit of the ATLAS collaboration
+  Copyright (C) 2002-2022 CERN for the benefit of the ATLAS collaboration
 */
-
-// $Id$
 /**
  * @file TrigCaloEventTPCnv/test/TrigTauClusterDetailsCnv_p2_test.cxx
  * @author scott snyder <snyder@bnl.gov>
@@ -14,6 +12,7 @@
 #undef NDEBUG
 #include "TrigCaloEventTPCnv/TrigTauClusterDetailsCnv_p2.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 TrigTauClusterDetails& 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;
-- 
GitLab