From fa2bbbed7921a8e3e5c8a8f6337b741ec0ef9ec5 Mon Sep 17 00:00:00 2001 From: scott snyder <sss@karma> Date: Tue, 1 Dec 2020 15:23:28 -0500 Subject: [PATCH] AthenaKernel: Fix compilation with gcc11. Can't use full template-id to name a destructor. --- Control/AthenaKernel/AthenaKernel/CondCont.icc | 4 ++-- Control/AthenaKernel/AthenaKernel/MetaCont.h | 2 +- 2 files changed, 3 insertions(+), 3 deletions(-) diff --git a/Control/AthenaKernel/AthenaKernel/CondCont.icc b/Control/AthenaKernel/AthenaKernel/CondCont.icc index 76f4cdcf021a..ab40ddbbf0e7 100644 --- a/Control/AthenaKernel/AthenaKernel/CondCont.icc +++ b/Control/AthenaKernel/AthenaKernel/CondCont.icc @@ -212,7 +212,7 @@ CondCont<T>::CondCont (Athena::IRCUSvc& rcusvc, * @brief Destructor. */ template <typename T> -CondCont<T>::~CondCont<T>() +CondCont<T>::~CondCont() { } @@ -409,7 +409,7 @@ bool CondContMixedBase::valid (const EventIDBase& t) const * @brief Destructor. */ template <typename T> -CondContMixed<T>::~CondContMixed<T>() +CondContMixed<T>::~CondContMixed() { } diff --git a/Control/AthenaKernel/AthenaKernel/MetaCont.h b/Control/AthenaKernel/AthenaKernel/MetaCont.h index c19ee682149a..62b1e079162a 100644 --- a/Control/AthenaKernel/AthenaKernel/MetaCont.h +++ b/Control/AthenaKernel/AthenaKernel/MetaCont.h @@ -104,7 +104,7 @@ namespace SG { /* * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * */ template <typename T> -MetaCont<T>::~MetaCont<T>() { +MetaCont<T>::~MetaCont() { for (auto t : m_metaSet) { delete t.second; } -- GitLab