[math] Fix enumerate() when range reference type is not a reference

modm-io · Feb 6, 2024 · 76b4e1a · 76b4e1a
1 parent 5ecda11
commit 76b4e1a
Showing 1 changed file with 7 additions and 2 deletions.
diff --git a/src/modm/math/algorithm/enumerate.hpp b/src/modm/math/algorithm/enumerate.hpp
@@ -12,8 +12,10 @@
 
 #pragma once
 
-#include <stdint.h>
+#include <cstdint>
+#include <ranges>
 #include <tuple>
+#include <utility>
 
 namespace modm
 {
@@ -31,7 +33,10 @@ constexpr auto enumerate(T && iterable)
         TIter iter;
         constexpr bool operator != (const iterator & other) const { return iter != other.iter; }
         constexpr void operator ++ () { ++i; ++iter; }
-        constexpr auto operator * () const { return std::tie(i, *iter); }
+        constexpr auto operator * () const
+        {
+            return std::tuple<size_t, std::ranges::range_reference_t<T>>{i, *iter};
+        }
     };
     struct iterable_wrapper
     {