diff --git a/Calorimeter/CaloEvent/CaloEvent/CaloClusterMomentStore.h b/Calorimeter/CaloEvent/CaloEvent/CaloClusterMomentStore.h
index 1a665a806a1d8d970b49cc690ce2b1cf7395b6b2..90c9f62b172b39484696bd59d3f58371180889af 100644
--- a/Calorimeter/CaloEvent/CaloEvent/CaloClusterMomentStore.h
+++ b/Calorimeter/CaloEvent/CaloEvent/CaloClusterMomentStore.h
@@ -1,5 +1,5 @@
 /*
-  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
@@ -59,7 +59,11 @@ class CaloClusterMomentStore
       CaloClusterMomentIterator(moment_store_const_iter iStore)
 	ATH_CLING_BODY (: m_actual(iStore) { } )
       /*! \brief Destructor */
+#ifdef __clang__
+      ~CaloClusterMomentIterator();
+#else
       ~CaloClusterMomentIterator() ATH_CLING_BODY( { } )
+#endif
 
       /*! \brief Iterator advance method */
       CaloClusterMomentIterator next()
diff --git a/Calorimeter/CaloEvent/src/CaloClusterMomentStore.cxx b/Calorimeter/CaloEvent/src/CaloClusterMomentStore.cxx
index 9e7a4e7374e10c76f2064762bc06fcdc9ee3fe45..be405ef58c74bb99760c187e2f80f36653f2e551 100644
--- a/Calorimeter/CaloEvent/src/CaloClusterMomentStore.cxx
+++ b/Calorimeter/CaloEvent/src/CaloClusterMomentStore.cxx
@@ -1,5 +1,5 @@
 /*
-  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&
     } 
   return oldSize < rMomList.size();
 }
+
+
+#ifdef __clang__
+CaloClusterMomentStore::CaloClusterMomentIterator::~CaloClusterMomentIterator() {}
+#endif