From 2a7e9dd8608520782bc7c6793cfa1d44cc1e148e Mon Sep 17 00:00:00 2001
From: scott snyder <snyder@bnl.gov>
Date: Sat, 13 Feb 2021 16:17:40 +0100
Subject: [PATCH] TrigMuonEventTPCnv: Tweak leak-checking for gcc10.

Need to call currentContext() before starting leakcheck.
---
 .../test/CombinedMuonFeatureCnv_p2_test.cxx                 | 6 +++---
 .../test/CombinedMuonFeatureCnv_p3_test.cxx                 | 6 +++---
 .../test/CombinedMuonFeatureCnv_p4_test.cxx                 | 6 +++---
 .../test/TileTrackMuFeatureCnv_p2_test.cxx                  | 6 +++---
 .../test/TileTrackMuFeatureCnv_p3_test.cxx                  | 6 +++---
 .../test/TrigMuonEFCbTrackCnv_p7_test.cxx                   | 6 +++---
 .../TrigMuonEventTPCnv/test/TrigMuonEFInfoCnv_p4_test.cxx   | 6 +++---
 .../TrigMuonEventTPCnv/test/TrigMuonEFInfoCnv_p5_test.cxx   | 6 +++---
 .../test/TrigMuonEFInfoTrackCnv_p1_test.cxx                 | 6 +++---
 .../test/TrigMuonEFIsolationCnv_p2_test.cxx                 | 6 +++---
 10 files changed, 30 insertions(+), 30 deletions(-)

diff --git a/Trigger/TrigEvent/TrigMuonEventTPCnv/test/CombinedMuonFeatureCnv_p2_test.cxx b/Trigger/TrigEvent/TrigMuonEventTPCnv/test/CombinedMuonFeatureCnv_p2_test.cxx
index fe262d27e47..8cedb1b16f9 100644
--- a/Trigger/TrigEvent/TrigMuonEventTPCnv/test/CombinedMuonFeatureCnv_p2_test.cxx
+++ b/Trigger/TrigEvent/TrigMuonEventTPCnv/test/CombinedMuonFeatureCnv_p2_test.cxx
@@ -1,8 +1,6 @@
 /*
-  Copyright (C) 2002-2017 CERN for the benefit of the ATLAS collaboration
+  Copyright (C) 2002-2021 CERN for the benefit of the ATLAS collaboration
 */
-
-// $Id$
 /**
  * @file TrigMuonEventTPCnv/test/CombinedMuonFeatureCnv_p2_test.cxx
  * @author scott snyder <snyder@bnl.gov>
@@ -16,6 +14,7 @@
 #include "SGTools/TestStore.h"
 #include "TestTools/leakcheck.h"
 #include "GaudiKernel/MsgStream.h"
+#include "GaudiKernel/ThreadLocalContext.h"
 #include <cassert>
 #include <iostream>
 #include <sstream>
@@ -52,6 +51,7 @@ void testit (const CombinedMuonFeature& trans1)
 void test1()
 {
   std::cout << "test1\n";
+  (void)Gaudi::Hive::currentContext();
   // Get proxies created outside of leak checking.
   ElementLink<MuonFeatureContainer> foo ("foo", 1);
   ElementLink<TrigInDetTrackCollection> bar ("bar", 2);
diff --git a/Trigger/TrigEvent/TrigMuonEventTPCnv/test/CombinedMuonFeatureCnv_p3_test.cxx b/Trigger/TrigEvent/TrigMuonEventTPCnv/test/CombinedMuonFeatureCnv_p3_test.cxx
index ff3b0653ef7..a245e2a3503 100644
--- a/Trigger/TrigEvent/TrigMuonEventTPCnv/test/CombinedMuonFeatureCnv_p3_test.cxx
+++ b/Trigger/TrigEvent/TrigMuonEventTPCnv/test/CombinedMuonFeatureCnv_p3_test.cxx
@@ -1,8 +1,6 @@
 /*
-  Copyright (C) 2002-2017 CERN for the benefit of the ATLAS collaboration
+  Copyright (C) 2002-2021 CERN for the benefit of the ATLAS collaboration
 */
-
-// $Id$
 /**
  * @file TrigMuonEventTPCnv/test/CombinedMuonFeatureCnv_p3_test.cxx
  * @author scott snyder <snyder@bnl.gov>
@@ -16,6 +14,7 @@
 #include "SGTools/TestStore.h"
 #include "TestTools/leakcheck.h"
 #include "GaudiKernel/MsgStream.h"
+#include "GaudiKernel/ThreadLocalContext.h"
 #include <cassert>
 #include <iostream>
 #include <sstream>
@@ -52,6 +51,7 @@ void testit (const CombinedMuonFeature& trans1)
 void test1()
 {
   std::cout << "test1\n";
+  (void)Gaudi::Hive::currentContext();
   // Get proxies created outside of leak checking.
   ElementLink<MuonFeatureContainer> foo ("foo", 1);
   ElementLink<TrigInDetTrackCollection> bar ("bar", 2);
diff --git a/Trigger/TrigEvent/TrigMuonEventTPCnv/test/CombinedMuonFeatureCnv_p4_test.cxx b/Trigger/TrigEvent/TrigMuonEventTPCnv/test/CombinedMuonFeatureCnv_p4_test.cxx
index 83fc93c5d7c..00b22805c2d 100644
--- a/Trigger/TrigEvent/TrigMuonEventTPCnv/test/CombinedMuonFeatureCnv_p4_test.cxx
+++ b/Trigger/TrigEvent/TrigMuonEventTPCnv/test/CombinedMuonFeatureCnv_p4_test.cxx
@@ -1,8 +1,6 @@
 /*
-  Copyright (C) 2002-2017 CERN for the benefit of the ATLAS collaboration
+  Copyright (C) 2002-2021 CERN for the benefit of the ATLAS collaboration
 */
-
-// $Id$
 /**
  * @file TrigMuonEventTPCnv/test/CombinedMuonFeatureCnv_p4_test.cxx
  * @author scott snyder <snyder@bnl.gov>
@@ -16,6 +14,7 @@
 #include "SGTools/TestStore.h"
 #include "TestTools/leakcheck.h"
 #include "GaudiKernel/MsgStream.h"
+#include "GaudiKernel/ThreadLocalContext.h"
 #include <cassert>
 #include <iostream>
 #include <sstream>
@@ -50,6 +49,7 @@ void testit (const CombinedMuonFeature& trans1)
 void test1()
 {
   std::cout << "test1\n";
+  (void)Gaudi::Hive::currentContext();
   // Get proxies created outside of leak checking.
   ElementLink<MuonFeatureContainer> foo ("foo", 1);
   ElementLink<TrigInDetTrackCollection> bar ("bar", 2);
diff --git a/Trigger/TrigEvent/TrigMuonEventTPCnv/test/TileTrackMuFeatureCnv_p2_test.cxx b/Trigger/TrigEvent/TrigMuonEventTPCnv/test/TileTrackMuFeatureCnv_p2_test.cxx
index a506a51fb3a..5e81e299515 100644
--- a/Trigger/TrigEvent/TrigMuonEventTPCnv/test/TileTrackMuFeatureCnv_p2_test.cxx
+++ b/Trigger/TrigEvent/TrigMuonEventTPCnv/test/TileTrackMuFeatureCnv_p2_test.cxx
@@ -1,8 +1,6 @@
 /*
-  Copyright (C) 2002-2017 CERN for the benefit of the ATLAS collaboration
+  Copyright (C) 2002-2021 CERN for the benefit of the ATLAS collaboration
 */
-
-// $Id$
 /**
  * @file TrigMuonEventTPCnv/test/TileTrackMuFeatureCnv_p2_test.cxx
  * @author scott snyder <snyder@bnl.gov>
@@ -16,6 +14,7 @@
 #include "SGTools/TestStore.h"
 #include "TestTools/leakcheck.h"
 #include "GaudiKernel/MsgStream.h"
+#include "GaudiKernel/ThreadLocalContext.h"
 #include <cassert>
 #include <iostream>
 #include <sstream>
@@ -49,6 +48,7 @@ void testit (const TileTrackMuFeature& trans1)
 void test1()
 {
   std::cout << "test1\n";
+  (void)Gaudi::Hive::currentContext();
   // Get proxies created outside of leak checking.
   ElementLink< TileMuFeatureContainer> foo ("foo", 10);
   ElementLink< TrigInDetTrackCollection> bar ("bar", 20);
diff --git a/Trigger/TrigEvent/TrigMuonEventTPCnv/test/TileTrackMuFeatureCnv_p3_test.cxx b/Trigger/TrigEvent/TrigMuonEventTPCnv/test/TileTrackMuFeatureCnv_p3_test.cxx
index 396e62ec8ff..332419dd7a0 100644
--- a/Trigger/TrigEvent/TrigMuonEventTPCnv/test/TileTrackMuFeatureCnv_p3_test.cxx
+++ b/Trigger/TrigEvent/TrigMuonEventTPCnv/test/TileTrackMuFeatureCnv_p3_test.cxx
@@ -1,8 +1,6 @@
 /*
-  Copyright (C) 2002-2017 CERN for the benefit of the ATLAS collaboration
+  Copyright (C) 2002-2021 CERN for the benefit of the ATLAS collaboration
 */
-
-// $Id$
 /**
  * @file TrigMuonEventTPCnv/test/TileTrackMuFeatureCnv_p3_test.cxx
  * @author scott snyder <snyder@bnl.gov>
@@ -16,6 +14,7 @@
 #include "SGTools/TestStore.h"
 #include "TestTools/leakcheck.h"
 #include "GaudiKernel/MsgStream.h"
+#include "GaudiKernel/ThreadLocalContext.h"
 #include <cassert>
 #include <iostream>
 #include <sstream>
@@ -49,6 +48,7 @@ void testit (const TileTrackMuFeature& trans1)
 void test1()
 {
   std::cout << "test1\n";
+  (void)Gaudi::Hive::currentContext();
   // Get proxies created outside of leak checking.
   ElementLink< TileMuFeatureContainer> foo ("foo", 10);
   ElementLink< TrigInDetTrackCollection> bar ("bar", 20);
diff --git a/Trigger/TrigEvent/TrigMuonEventTPCnv/test/TrigMuonEFCbTrackCnv_p7_test.cxx b/Trigger/TrigEvent/TrigMuonEventTPCnv/test/TrigMuonEFCbTrackCnv_p7_test.cxx
index bde9afcc9fe..d59eed7f049 100644
--- a/Trigger/TrigEvent/TrigMuonEventTPCnv/test/TrigMuonEFCbTrackCnv_p7_test.cxx
+++ b/Trigger/TrigEvent/TrigMuonEventTPCnv/test/TrigMuonEFCbTrackCnv_p7_test.cxx
@@ -1,8 +1,6 @@
 /*
-  Copyright (C) 2002-2017 CERN for the benefit of the ATLAS collaboration
+  Copyright (C) 2002-2021 CERN for the benefit of the ATLAS collaboration
 */
-
-// $Id$
 /**
  * @file TrigMuonEventTPCnv/test/TrigMuonEFCbTrackCnv_p7_test.cxx
  * @author scott snyder <snyder@bnl.gov>
@@ -18,6 +16,7 @@
 #include "SGTools/TestStore.h"
 #include "TestTools/leakcheck.h"
 #include "GaudiKernel/MsgStream.h"
+#include "GaudiKernel/ThreadLocalContext.h"
 #include <cassert>
 #include <iostream>
 
@@ -88,6 +87,7 @@ void testit (const TrigMuonEFCbTrack& trans1)
 void test1()
 {
   std::cout << "test1\n";
+  (void)Gaudi::Hive::currentContext();
   // Get proxy created outside of leak checking.
   ElementLink<Rec::TrackParticleContainer> foo ("foo", 10);
   Athena_test::Leakcheck check;
diff --git a/Trigger/TrigEvent/TrigMuonEventTPCnv/test/TrigMuonEFInfoCnv_p4_test.cxx b/Trigger/TrigEvent/TrigMuonEventTPCnv/test/TrigMuonEFInfoCnv_p4_test.cxx
index f32e49bb528..12e046cdaa7 100644
--- a/Trigger/TrigEvent/TrigMuonEventTPCnv/test/TrigMuonEFInfoCnv_p4_test.cxx
+++ b/Trigger/TrigEvent/TrigMuonEventTPCnv/test/TrigMuonEFInfoCnv_p4_test.cxx
@@ -1,8 +1,6 @@
 /*
-  Copyright (C) 2002-2019 CERN for the benefit of the ATLAS collaboration
+  Copyright (C) 2002-2021 CERN for the benefit of the ATLAS collaboration
 */
-
-// $Id$
 /**
  * @file TrigMuonEventTPCnv/test/TrigMuonEFInfoCnv_p4_test.cxx
  * @author scott snyder <snyder@bnl.gov>
@@ -18,6 +16,7 @@
 #include "TestTools/FLOATassert.h"
 #include "TestTools/leakcheck.h"
 #include "GaudiKernel/MsgStream.h"
+#include "GaudiKernel/ThreadLocalContext.h"
 #include <cassert>
 #include <iostream>
 
@@ -155,6 +154,7 @@ void testit (const TrigMuonEFInfo& trans1)
 void test1()
 {
   std::cout << "test1\n";
+  (void)Gaudi::Hive::currentContext();
   // Get proxy created outside of leak checking.
   ElementLink<Rec::TrackParticleContainer> foo ("foo", 10);
   Athena_test::Leakcheck check;
diff --git a/Trigger/TrigEvent/TrigMuonEventTPCnv/test/TrigMuonEFInfoCnv_p5_test.cxx b/Trigger/TrigEvent/TrigMuonEventTPCnv/test/TrigMuonEFInfoCnv_p5_test.cxx
index 8de4a0a770e..31d6463e5e0 100644
--- a/Trigger/TrigEvent/TrigMuonEventTPCnv/test/TrigMuonEFInfoCnv_p5_test.cxx
+++ b/Trigger/TrigEvent/TrigMuonEventTPCnv/test/TrigMuonEFInfoCnv_p5_test.cxx
@@ -1,8 +1,6 @@
 /*
-  Copyright (C) 2002-2019 CERN for the benefit of the ATLAS collaboration
+  Copyright (C) 2002-2021 CERN for the benefit of the ATLAS collaboration
 */
-
-// $Id$
 /**
  * @file TrigMuonEventTPCnv/test/TrigMuonEFInfoCnv_p5_test.cxx
  * @author scott snyder <snyder@bnl.gov>
@@ -18,6 +16,7 @@
 #include "TestTools/FLOATassert.h"
 #include "TestTools/leakcheck.h"
 #include "GaudiKernel/MsgStream.h"
+#include "GaudiKernel/ThreadLocalContext.h"
 #include <cassert>
 #include <iostream>
 
@@ -153,6 +152,7 @@ void testit (const TrigMuonEFInfo& trans1)
 void test1()
 {
   std::cout << "test1\n";
+  (void)Gaudi::Hive::currentContext();
   // Get proxy created outside of leak checking.
   ElementLink<Rec::TrackParticleContainer> foo ("foo", 10);
   Athena_test::Leakcheck check;
diff --git a/Trigger/TrigEvent/TrigMuonEventTPCnv/test/TrigMuonEFInfoTrackCnv_p1_test.cxx b/Trigger/TrigEvent/TrigMuonEventTPCnv/test/TrigMuonEFInfoTrackCnv_p1_test.cxx
index 09366942cf2..305082f19ec 100644
--- a/Trigger/TrigEvent/TrigMuonEventTPCnv/test/TrigMuonEFInfoTrackCnv_p1_test.cxx
+++ b/Trigger/TrigEvent/TrigMuonEventTPCnv/test/TrigMuonEFInfoTrackCnv_p1_test.cxx
@@ -1,8 +1,6 @@
 /*
-  Copyright (C) 2002-2019 CERN for the benefit of the ATLAS collaboration
+  Copyright (C) 2002-2021 CERN for the benefit of the ATLAS collaboration
 */
-
-// $Id$
 /**
  * @file TrigMuonEventTPCnv/test/TrigMuonEFInfoTrackCnv_p1_test.cxx
  * @author scott snyder <snyder@bnl.gov>
@@ -18,6 +16,7 @@
 #include "TestTools/FLOATassert.h"
 #include "TestTools/leakcheck.h"
 #include "GaudiKernel/MsgStream.h"
+#include "GaudiKernel/ThreadLocalContext.h"
 #include <cassert>
 #include <iostream>
 
@@ -110,6 +109,7 @@ void testit (const TrigMuonEFInfoTrack& trans1)
 void test1()
 {
   std::cout << "test1\n";
+  (void)Gaudi::Hive::currentContext();
   // Get proxy created outside of leak checking.
   ElementLink<Rec::TrackParticleContainer>foo("foo", 10);
   Athena_test::Leakcheck check;
diff --git a/Trigger/TrigEvent/TrigMuonEventTPCnv/test/TrigMuonEFIsolationCnv_p2_test.cxx b/Trigger/TrigEvent/TrigMuonEventTPCnv/test/TrigMuonEFIsolationCnv_p2_test.cxx
index e4022b6cded..edeff5ecaa7 100644
--- a/Trigger/TrigEvent/TrigMuonEventTPCnv/test/TrigMuonEFIsolationCnv_p2_test.cxx
+++ b/Trigger/TrigEvent/TrigMuonEventTPCnv/test/TrigMuonEFIsolationCnv_p2_test.cxx
@@ -1,8 +1,6 @@
 /*
-  Copyright (C) 2002-2017 CERN for the benefit of the ATLAS collaboration
+  Copyright (C) 2002-2021 CERN for the benefit of the ATLAS collaboration
 */
-
-// $Id$
 /**
  * @file TrigMuonEventTPCnv/test/TrigMuonEFIsolationCnv_p2_test.cxx
  * @author scott snyder <snyder@bnl.gov>
@@ -16,6 +14,7 @@
 #include "SGTools/TestStore.h"
 #include "TestTools/leakcheck.h"
 #include "GaudiKernel/MsgStream.h"
+#include "GaudiKernel/ThreadLocalContext.h"
 #include <cassert>
 #include <iostream>
 
@@ -50,6 +49,7 @@ void testit (const TrigMuonEFIsolation& trans1)
 void test1()
 {
   std::cout << "test1\n";
+  (void)Gaudi::Hive::currentContext();
   // Get proxy created outside of leak checking.
   ElementLink<TrigMuonEFInfoContainer> foo ("foo", 10);
   Athena_test::Leakcheck check;
-- 
GitLab