Skip to content
Snippets Groups Projects
Commit 37673531 authored by Scott Snyder's avatar Scott Snyder Committed by scott snyder
Browse files

CaloEvent: Clang fix.

The previous root workaround change causes a problem with clang, which
doesn't seem to properly implement __attribute__((used)) for destructors.
For clang, move the destructor completely out-of-line.  (Trying to remove
the destructor entirely resulted in a mysterious crash in TClass...).


Former-commit-id: 806825294b5df121673c2a2dc78a5519e036e565
parent 29182449
No related branches found
No related tags found
No related merge requests found
/* /*
Copyright (C) 2002-2017 CERN for the benefit of the ATLAS collaboration Copyright (C) 2002-2018 CERN for the benefit of the ATLAS collaboration
*/ */
#ifndef CALOEVENT_CALOCLUSTERMOMENTSTORE_H #ifndef CALOEVENT_CALOCLUSTERMOMENTSTORE_H
...@@ -59,7 +59,11 @@ class CaloClusterMomentStore ...@@ -59,7 +59,11 @@ class CaloClusterMomentStore
CaloClusterMomentIterator(moment_store_const_iter iStore) CaloClusterMomentIterator(moment_store_const_iter iStore)
ATH_CLING_BODY (: m_actual(iStore) { } ) ATH_CLING_BODY (: m_actual(iStore) { } )
/*! \brief Destructor */ /*! \brief Destructor */
#ifdef __clang__
~CaloClusterMomentIterator();
#else
~CaloClusterMomentIterator() ATH_CLING_BODY( { } ) ~CaloClusterMomentIterator() ATH_CLING_BODY( { } )
#endif
/*! \brief Iterator advance method */ /*! \brief Iterator advance method */
CaloClusterMomentIterator next() CaloClusterMomentIterator next()
......
/* /*
Copyright (C) 2002-2017 CERN for the benefit of the ATLAS collaboration Copyright (C) 2002-2018 CERN for the benefit of the ATLAS collaboration
*/ */
...@@ -68,3 +68,8 @@ bool CaloClusterMomentStore::retrieveMomentTypes(moment_type_list& ...@@ -68,3 +68,8 @@ bool CaloClusterMomentStore::retrieveMomentTypes(moment_type_list&
} }
return oldSize < rMomList.size(); return oldSize < rMomList.size();
} }
#ifdef __clang__
CaloClusterMomentStore::CaloClusterMomentIterator::~CaloClusterMomentIterator() {}
#endif
0% Loading or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment