fix Indexed

Siv3D · Jul 18, 2024 · c7b7aac · c7b7aac
1 parent 9c77228
commit c7b7aac
Showing 1 changed file with 6 additions and 2 deletions.
diff --git a/Siv3D/include/Siv3D/detail/Indexed.ipp b/Siv3D/include/Siv3D/detail/Indexed.ipp
@@ -20,11 +20,13 @@ namespace s3d
 
 		struct Iterator
 		{
+			using value_type = std::tuple<size_t, typename std::iterator_traits<It>::value_type>;
+			using reference = std::tuple<size_t, decltype(*std::declval<It&>())>;
 			size_t index;
 			It it;
 			constexpr bool operator != (const Iterator& other) const { return it != other.it; }
 			constexpr void operator ++() { ++index; ++it; }
-			constexpr auto operator *() const { return std::tie(index, *it); }
+			constexpr auto operator *() const { return reference{ index, *it }; }
 		};
 
 		struct IterableWrapper
@@ -48,11 +50,13 @@ namespace s3d
 	{
 		struct Iterator
 		{
+			using value_type = std::tuple<size_t, typename std::iterator_traits<It>::value_type>;
+			using reference = std::tuple<size_t, decltype(*std::declval<It&>())>;
 			size_t index;
 			It it;
 			constexpr bool operator != (const Iterator& other) const { return it != other.it; }
 			constexpr void operator ++() { --index; ++it; }
-			constexpr auto operator *() const { return std::tie(index, *it); }
+			constexpr auto operator *() const { return reference{ index, *it }; }
 		};
 
 		struct IterableWrapper