From 9c806888c06bd84eb7f7eecc355d612eb4f1a3bb Mon Sep 17 00:00:00 2001
From: Max Lyon <lyon@cs.rwth-aachen.de>
Date: Thu, 28 Nov 2019 13:42:17 +0100
Subject: [PATCH] more const related fixes in SmartRange

---
 src/OpenMesh/Core/Mesh/SmartRange.hh | 8 ++++----
 1 file changed, 4 insertions(+), 4 deletions(-)

diff --git a/src/OpenMesh/Core/Mesh/SmartRange.hh b/src/OpenMesh/Core/Mesh/SmartRange.hh
index affaeb71..b87a8bea 100644
--- a/src/OpenMesh/Core/Mesh/SmartRange.hh
+++ b/src/OpenMesh/Core/Mesh/SmartRange.hh
@@ -78,13 +78,13 @@ struct SmartRangeT
    *  @param f Functor that is applied to all elements before computing the sum
    */
   template <typename Functor>
-  auto sum(Functor&& f) -> decltype (f(std::declval<HandleT>()))
+  auto sum(Functor&& f) -> typename std::decay<decltype (f(std::declval<HandleT>()))>::type
   {
     auto range = static_cast<const RangeT*>(this);
     auto begin = range->begin();
     auto end   = range->end();
     assert(begin != end);
-    decltype (f(*begin)) sum = f(*begin);
+    typename std::decay<decltype (f(*begin))>::type sum = f(*begin);
     auto it = begin;
     ++it;
     for (; it != end; ++it)
@@ -99,13 +99,13 @@ struct SmartRangeT
    *  @param f Functor that is applied to all elements before computing the average.
    */
   template <typename Functor>
-  auto avg(Functor&& f) -> decltype (f(std::declval<HandleT>()))
+  auto avg(Functor&& f) -> typename std::decay<decltype (f(std::declval<HandleT>()))>::type
   {
     auto range = static_cast<const RangeT*>(this);
     auto begin = range->begin();
     auto end   = range->end();
     assert(begin != end);
-    decltype (f(*begin)) sum = f(*begin);
+    typename std::decay<decltype (f(*begin))>::type sum = f(*begin);
     auto it = begin;
     ++it;
     int n_elements = 1;