Merge branch 'regvar.DataModelTestDataRead-20240518' into 'main'

DataModelTestDataRead: Use AUXVAR_DECL.

See merge request !71503

Control/DataModelTest/DataModelTestDataRead/DataModelTestDataRead/versions/AllocTestAuxContainer_v1.h

 // This file's extension implies that it's C, but it's really -*- C++ -*-.
 /*
-  Copyright (C) 2002-2022 CERN for the benefit of the ATLAS collaboration
+  Copyright (C) 2002-2024 CERN for the benefit of the ATLAS collaboration
  */
 /**
  * @file DataModelTestDataRead/versions/AllocTestAuxContainer_v1.h
@@ -41,10 +41,10 @@ public:
 
 
   // For this one, the dictionary will always be present (from AthContainers).
-  std::vector<int, std::pmr::polymorphic_allocator<int> > atInt1;
+  AUXVAR_DECL (int, atInt1, std::pmr::polymorphic_allocator);
 
   // For this one, the dictionary is only present in this package.
-  std::vector<int, Athena_test::TestAlloc<int> > atInt2;
+  AUXVAR_DECL (int, atInt2, Athena_test::TestAlloc);
 };
 
 

Control/DataModelTest/DataModelTestDataRead/DataModelTestDataRead/versions/GAuxContainer_v1.h

 // This file's extension implies that it's C, but it's really -*- C++ -*-.
 
 /*
-  Copyright (C) 2002-2020 CERN for the benefit of the ATLAS collaboration
+  Copyright (C) 2002-2024 CERN for the benefit of the ATLAS collaboration
 */
 /**
  * @file DataModelTestDataRead/versions/GAuxContainer_v1.h
@@ -31,9 +31,9 @@ public:
   GAuxContainer_v1();
 
 private:
-  SG::PackedContainer<int> anInt;
-  std::vector<float> gFloat;
-  std::vector<std::vector<float> > gvFloat;
+  AUXVAR_PACKEDCONTAINER_DECL (int, anInt);
+  AUXVAR_DECL (float, gFloat);
+  AUXVAR_DECL (std::vector<float>, gvFloat);
 };
 
 

Control/DataModelTest/DataModelTestDataRead/DataModelTestDataRead/versions/HAuxContainer_v1.h

 // This file's extension implies that it's C, but it's really -*- C++ -*-.
-
 /*
-  Copyright (C) 2002-2017 CERN for the benefit of the ATLAS collaboration
+  Copyright (C) 2002-2024 CERN for the benefit of the ATLAS collaboration
 */
-
-// $Id$
-/**
+/*
  * @file DataModelTestDataRead/versions/HAuxContainer_v1.h
  * @author scott snyder <snyder@bnl.gov>
  * @date Jan, 2016
@@ -32,7 +29,7 @@ public:
   HAuxContainer_v1();
 
 private:
-  std::vector<int> anInt;
+  AUXVAR_DECL (int, anInt);
 };
 
 

Control/DataModelTest/DataModelTestDataRead/DataModelTestDataRead/versions/HAuxContainer_v2.h

 // This file's extension implies that it's C, but it's really -*- C++ -*-.
-
 /*
-  Copyright (C) 2002-2017 CERN for the benefit of the ATLAS collaboration
+  Copyright (C) 2002-2024 CERN for the benefit of the ATLAS collaboration
 */
-
-// $Id$
 /**
  * @file DataModelTestDataRead/versions/HAuxContainer_v2.h
  * @author scott snyder <snyder@bnl.gov>
@@ -33,7 +30,7 @@ public:
   HAuxContainer_v2();
 
 private:
-  std::vector<float> aFloat;
+  AUXVAR_DECL (float, aFloat);
 };
 
 

Control/DataModelTest/DataModelTestDataRead/src/AllocTestAuxContainer_v1.cxx

 /*
-  Copyright (C) 2002-2022 CERN for the benefit of the ATLAS collaboration
+  Copyright (C) 2002-2024 CERN for the benefit of the ATLAS collaboration
 */
 /**
  * @file DataModelTestDataRead/src/AllocTestAuxContainer_v1.cxx
@@ -64,11 +64,8 @@ namespace DMTest {
 
 
 AllocTestAuxContainer_v1::AllocTestAuxContainer_v1()
-  : xAOD::AuxContainerBase(),
-    atInt1 (&memRes)
+  : xAOD::AuxContainerBase(&memRes)
 {
-  AUX_VARIABLE (atInt1);
-  AUX_VARIABLE (atInt2);
 }
 
 

Control/DataModelTest/DataModelTestDataRead/src/GAuxContainer_v1.cxx

 /*
-  Copyright (C) 2002-2020 CERN for the benefit of the ATLAS collaboration
+  Copyright (C) 2002-2024 CERN for the benefit of the ATLAS collaboration
 */
 /**
  * @file DataModelTestDataRead/src/GAuxContainer_v1.cxx
@@ -20,15 +20,10 @@ namespace DMTest {
 GAuxContainer_v1::GAuxContainer_v1()
   : xAOD::AuxContainerBase()
 {
-  AUX_VARIABLE (anInt);
-
   if (!anInt.setOption (SG::AuxDataOption ("nbits", 17)))
   {
     throw std::runtime_error ("Can't set packing options in GAuxContainer_v1");
   }
-
-  AUX_VARIABLE (gFloat);
-  AUX_VARIABLE (gvFloat);
 }
 
 

Control/DataModelTest/DataModelTestDataRead/src/HAuxContainer_v1.cxx

 /*
-  Copyright (C) 2002-2017 CERN for the benefit of the ATLAS collaboration
+  Copyright (C) 2002-2024 CERN for the benefit of the ATLAS collaboration
 */
-
-// $Id$
 /**
  * @file DataModelTestDataRead/src/HAuxContainer_v1.cxx
  * @author scott snyder <snyder@bnl.gov>
@@ -20,7 +18,6 @@ namespace DMTest {
 HAuxContainer_v1::HAuxContainer_v1()
   : xAOD::AuxContainerBase()
 {
-  AUX_VARIABLE (anInt);
 }
 
 

Control/DataModelTest/DataModelTestDataRead/src/HAuxContainer_v2.cxx

 /*
-  Copyright (C) 2002-2017 CERN for the benefit of the ATLAS collaboration
+  Copyright (C) 2002-2024 CERN for the benefit of the ATLAS collaboration
 */
-
-// $Id$
 /**
  * @file DataModelTestDataRead/src/HAuxContainer_v2.cxx
  * @author scott snyder <snyder@bnl.gov>
@@ -20,7 +18,6 @@ namespace DMTest {
 HAuxContainer_v2::HAuxContainer_v2()
   : xAOD::AuxContainerBase()
 {
-  AUX_VARIABLE (aFloat);
 }