Merge branch 'clang.TrigEFMissingET-20200904' into 'master'

TrigEFMissingET: Fix compilation with clang.

See merge request atlas/athena!36163

Trigger/TrigAlgorithms/TrigEFMissingET/TrigEFMissingET/PeriodicGridBase.h

@@ -82,6 +82,8 @@ namespace HLT
       {
       public:
         Tower(std::size_t index);
+        virtual ~Tower() = default;
+
         /// The grid which owns this tower
         virtual const PeriodicGridBase *grid() const = 0;
 
@@ -191,4 +193,4 @@ namespace HLT
   }    // namespace MET
 } // namespace HLT
 
-#endif //> !PUFITUTILS_PERIODICGRIDBASE_H
\ No newline at end of file
+#endif //> !PUFITUTILS_PERIODICGRIDBASE_H

Trigger/TrigAlgorithms/TrigEFMissingET/TrigEFMissingET/PufitMultiGrid.icc

@@ -233,7 +233,8 @@ namespace HLT
 
     template <typename Grid>
     template <std::size_t I>
-    PufitMultiGridSet<Grid>::Element<I> &PufitMultiGridSet<Grid>::Element<I>::operator+=(
+    typename PufitMultiGridSet<Grid>::template Element<I>&
+    PufitMultiGridSet<Grid>::Element<I>::operator+=(
         const SignedKinematics &kin)
     {
       for (Grid &grid : parent.grids)
@@ -243,7 +244,8 @@ namespace HLT
 
     template <typename Grid>
     template <std::size_t I>
-    PufitMultiGridSet<Grid>::Element<I> &PufitMultiGridSet<Grid>::Element<I>::operator-=(
+    typename PufitMultiGridSet<Grid>::template Element<I>&
+    PufitMultiGridSet<Grid>::Element<I>::operator-=(
         const SignedKinematics &kin)
     {
       for (Grid &grid : parent.grids)
@@ -253,7 +255,8 @@ namespace HLT
 
     template <typename Grid>
     template <std::size_t I, typename, typename>
-    PufitMultiGridSet<Grid>::Element<I> PufitMultiGridSet<Grid>::get()
+    typename PufitMultiGridSet<Grid>::template Element<I>
+    PufitMultiGridSet<Grid>::get()
     {
       return Element<I>(*this);
     }
@@ -310,4 +313,4 @@ namespace HLT
   } // namespace MET
 } // namespace HLT
 
-#endif //> !TRIGEFMISSINGET_PUFITMULTIGRID_ICC
\ No newline at end of file
+#endif //> !TRIGEFMISSINGET_PUFITMULTIGRID_ICC