diff --git a/Control/AthContainers/AthContainers/DataVector.h b/Control/AthContainers/AthContainers/DataVector.h
index 87493cbb08dcdfeaeacd9803ed75b5dab6536631..9ef2ae99597f9753a8c4055c07cbe128d4efa16d 100644
--- a/Control/AthContainers/AthContainers/DataVector.h
+++ b/Control/AthContainers/AthContainers/DataVector.h
@@ -1,11 +1,8 @@
// This file's extension implies that it's C, but it's really -*- C++ -*-.
/*
- 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: DataVector.h 794113 2017-01-26 22:01:47Z ssnyder $
-
/**
* @file AthContainers/DataVector.h
* @author scott snyder, Paolo Calafiura, etc
@@ -1962,10 +1959,6 @@ private:
SG::IsMostDerivedFlag m_isMostDerived;
- /// The DV/DL info struct for this class.
- static const DataModel_detail::DVLInfo<DataVector<T> > s_info;
-
-
typedef typename
ROOT_SELECTION_NS::DataVector<T, DataVector_BASE>::self self;
};
@@ -3180,10 +3173,6 @@ private:
SG::IsMostDerivedFlag m_isMostDerived;
- /// The DV/DL info struct for this class.
- static const DataModel_detail::DVLInfo<DataVector<T> > s_info;
-
-
typedef typename
ROOT_SELECTION_NS::DataVector<T, DataVector_BASE>::self self;
};
diff --git a/Control/AthContainers/AthContainers/DataVector.icc b/Control/AthContainers/AthContainers/DataVector.icc
index 0eb26a1ea053ac046c8ed3c9d00a2bc63cb1fcad..7a5fcc10edd1dc60a4588922ef51c3a248cd7210 100644
--- a/Control/AthContainers/AthContainers/DataVector.icc
+++ b/Control/AthContainers/AthContainers/DataVector.icc
@@ -1,10 +1,8 @@
// Dear emacs, this is -*- c++ -*-
/*
- 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: DataVector.icc 794113 2017-01-26 22:01:47Z ssnyder $
/**
* @file AthContainers/DataVector.icc
* @author scott snyder, Paolo Calafiura, etc
@@ -1655,7 +1653,8 @@ void DataVector<T, BASE>::clear (SG::OwnershipPolicy ownPolicy,
template <class T, class BASE>
const DataModel_detail::DVLInfoBase& DataVector<T, BASE>::dvlinfo()
{
- return s_info;
+ static const DataModel_detail::DVLInfo<DataVector<T, BASE> > info;
+ return info;
}
@@ -1667,7 +1666,7 @@ const DataModel_detail::DVLInfoBase& DataVector<T, BASE>::dvlinfo()
template <class T, class BASE>
const DataModel_detail::DVLInfoBase& DataVector<T, BASE>::dvlinfo_v() const
{
- return s_info;
+ return DataVector<T, BASE>::dvlinfo();
}
@@ -1955,11 +1954,6 @@ void DataVector<T, BASE>::setMostDerived()
}
-/// The DV/DL info struct for this class.
-template <class T, class BASE>
-const DataModel_detail::DVLInfo<DataVector<T> > DataVector<T, BASE>::s_info;
-
-
//****************************************************************************
// Specialized (base) DataVector implementation.
//
@@ -3365,7 +3359,8 @@ void DATAVECTOR::clear (SG::OwnershipPolicy ownPolicy,
template <class T>
const DataModel_detail::DVLInfoBase& DATAVECTOR::dvlinfo()
{
- return s_info;
+ static const DataModel_detail::DVLInfo<DataVector<T, DataModel_detail::NoBase> > info;
+ return info;
}
@@ -3377,7 +3372,7 @@ const DataModel_detail::DVLInfoBase& DATAVECTOR::dvlinfo()
template <class T>
const DataModel_detail::DVLInfoBase& DATAVECTOR::dvlinfo_v() const
{
- return s_info;
+ return DATAVECTOR::dvlinfo();
}
@@ -3703,11 +3698,6 @@ void DATAVECTOR::setMostDerived()
}
-/// The DV/DL info struct for this class.
-template <class T>
-const DataModel_detail::DVLInfo<DataVector<T> > DATAVECTOR::s_info;
-
-
#undef DATAVECTOR
diff --git a/Event/EventCommonTPCnv/test/INav4MomAssocsCnv_p1_test.cxx b/Event/EventCommonTPCnv/test/INav4MomAssocsCnv_p1_test.cxx
index 4a138acc029f5db6f564b827cfc53c1f798c47dc..0a499cd727847ed92ec7a56e5aa928bcce4e6849 100644
--- a/Event/EventCommonTPCnv/test/INav4MomAssocsCnv_p1_test.cxx
+++ b/Event/EventCommonTPCnv/test/INav4MomAssocsCnv_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 EventCommonTPCnv/test/INav4MomAssocsCnv_p1_test.cxx
@@ -84,6 +84,7 @@ void test1()
// Get proxies created.
ElementLink<INavigable4MomentumCollection> dum1 ("in", 3);
ElementLink<INavigable4MomentumCollection> dum2 ("xn", 2);
+ INavigable4MomentumCollection::dvlinfo();
Athena_test::Leakcheck check;
diff --git a/Event/EventCommonTPCnv/test/INav4MomAssocsCnv_p2_test.cxx b/Event/EventCommonTPCnv/test/INav4MomAssocsCnv_p2_test.cxx
index f45242585169ab9914f968d738eef25bea5b3e1c..00f981ab6f4e014a717c144e2edacaeb5b06de5e 100644
--- a/Event/EventCommonTPCnv/test/INav4MomAssocsCnv_p2_test.cxx
+++ b/Event/EventCommonTPCnv/test/INav4MomAssocsCnv_p2_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 EventCommonTPCnv/test/INav4MomAssocsCnv_p2_test.cxx
@@ -80,6 +80,7 @@ void test1()
// Get proxies created.
ElementLink<INavigable4MomentumCollection> dum1 ("in", 3);
ElementLink<INavigable4MomentumCollection> dum2 ("xn", 2);
+ INavigable4MomentumCollection::dvlinfo();
Athena_test::Leakcheck check;
diff --git a/Event/EventCommonTPCnv/test/INav4MomAssocsCnv_p3_test.cxx b/Event/EventCommonTPCnv/test/INav4MomAssocsCnv_p3_test.cxx
index b39e2af3967ff7de69306effd8640cb81df18f07..4a10dc19297631297d5fb1026d46ecbe099bc5dc 100644
--- a/Event/EventCommonTPCnv/test/INav4MomAssocsCnv_p3_test.cxx
+++ b/Event/EventCommonTPCnv/test/INav4MomAssocsCnv_p3_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 EventCommonTPCnv/test/INav4MomAssocsCnv_p3_test.cxx
@@ -80,6 +80,7 @@ void test1()
// Get proxies created.
ElementLink<INavigable4MomentumCollection> dum1 ("in", 3);
ElementLink<INavigable4MomentumCollection> dum2 ("xn", 2);
+ INavigable4MomentumCollection::dvlinfo();
Athena_test::Leakcheck check;
diff --git a/PhysicsAnalysis/AnalysisCommon/ParticleEventTPCnv/test/INav4MomToTrackParticleAssocsCnv_p1_test.cxx b/PhysicsAnalysis/AnalysisCommon/ParticleEventTPCnv/test/INav4MomToTrackParticleAssocsCnv_p1_test.cxx
index 6084f944a814a7e052e252dbb8d969f12796d955..9d6ad68396ce5deaeab8b94f55d509b8ff02b993 100644
--- a/PhysicsAnalysis/AnalysisCommon/ParticleEventTPCnv/test/INav4MomToTrackParticleAssocsCnv_p1_test.cxx
+++ b/PhysicsAnalysis/AnalysisCommon/ParticleEventTPCnv/test/INav4MomToTrackParticleAssocsCnv_p1_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 ParticleEventTPCnv/test/INav4MomToTrackParticleAssocsCnv_p1_test.cxx
* @author scott snyder <snyder@bnl.gov>
@@ -63,6 +61,9 @@ void test1()
ElementLink<INavigable4MomentumCollection> dum1 ("in", 3);
ElementLink<Rec::TrackParticleContainer> dum2 ("tp", 2);
DataLink<INav4MomToTrackParticleAssocs> storelink ("xstore");
+
+ INavigable4MomentumCollection::dvlinfo();
+
Athena_test::Leakcheck check;
INav4MomToTrackParticleAssocs trans1;
diff --git a/PhysicsAnalysis/AnalysisCommon/ParticleEventTPCnv/test/ParticleShallowCloneCnv_p1_test.cxx b/PhysicsAnalysis/AnalysisCommon/ParticleEventTPCnv/test/ParticleShallowCloneCnv_p1_test.cxx
index d00a880584e1fa937cd3a5e450c62b341decabbb..b1a526937f9506ba0ef83fad3394dab26b9b8ce0 100644
--- a/PhysicsAnalysis/AnalysisCommon/ParticleEventTPCnv/test/ParticleShallowCloneCnv_p1_test.cxx
+++ b/PhysicsAnalysis/AnalysisCommon/ParticleEventTPCnv/test/ParticleShallowCloneCnv_p1_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 ParticleEventTPCnv/test/ParticleShallowCloneCnv_p1_test.cxx
* @author scott snyder <snyder@bnl.gov>
@@ -62,6 +60,8 @@ void test1()
SGTest::store.record (c, "cont");
ElementLink<VxContainer> origin ("vx", 0);
+ IParticleContainer::dvlinfo();
+
Athena_test::Leakcheck check;
P4Momentum_t mom (100, 200, 300, 400);
Analysis::ParticleShallowClone trans1 (MasterLink_t ("cont", 0),
diff --git a/PhysicsAnalysis/AnalysisCommon/ParticleEventTPCnv/test/ParticleShallowCloneContainerCnv_p1_test.cxx b/PhysicsAnalysis/AnalysisCommon/ParticleEventTPCnv/test/ParticleShallowCloneContainerCnv_p1_test.cxx
index fd7f3a427e715f7a42351b74d90ae37146ef97ac..4669f4d3a7babae5a3f7e6ae54339b35d34468eb 100644
--- a/PhysicsAnalysis/AnalysisCommon/ParticleEventTPCnv/test/ParticleShallowCloneContainerCnv_p1_test.cxx
+++ b/PhysicsAnalysis/AnalysisCommon/ParticleEventTPCnv/test/ParticleShallowCloneContainerCnv_p1_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 ParticleEventTPCnv/test/ParticleShallowCloneContainerCnv_p1_test.cxx
* @author scott snyder <snyder@bnl.gov>
@@ -66,6 +64,8 @@ void test1()
DataPool<Analysis::ParticleShallowClone> pooldum;
}
+ IParticleContainer::dvlinfo();
+
Athena_test::Leakcheck check;
P4Momentum_t mom (100, 200, 300, 400);