EnumArray: Fix iterator not being copyable

Author: SirLynix

include/NazaraUtils/EnumArray.hpp

@@ -39,15 +39,15 @@ namespace Nz
 				constexpr kv_iterator begin() noexcept;
 				constexpr kv_iterator end() noexcept;
 
-				EnumArray& arrayRef;
+				EnumArray* arrayRef;
 			};
 
 			struct kv_const_iter_tag
 			{
 				constexpr kv_const_iterator begin() const noexcept;
 				constexpr kv_const_iterator end() const noexcept;
 
-				const EnumArray& arrayRef;
+				const EnumArray* arrayRef;
 			};
 	};
 
@@ -93,7 +93,7 @@ namespace Nz
 			constexpr bool operator>=(const EnumArrayKvIterator& rhs) const noexcept;
 
 		private:
-			std::conditional_t<Const, const Array, Array>& m_array;
+			std::conditional_t<Const, const Array, Array>* m_array;
 			difference_type m_index;
 	};
 

include/NazaraUtils/EnumArray.inl

@@ -9,13 +9,13 @@ namespace Nz
 	template<typename E, typename V>
 	constexpr auto EnumArray<E, V>::iter_kv() noexcept -> kv_iter_tag
 	{
-		return kv_iter_tag{ *this };
+		return kv_iter_tag{ this };
 	}
 
 	template<typename E, typename V>
 	constexpr auto EnumArray<E, V>::iter_kv() const noexcept -> kv_const_iter_tag
 	{
-		return kv_const_iter_tag{ *this };
+		return kv_const_iter_tag{ this };
 	}
 
 	template<typename E, typename V>
@@ -40,7 +40,7 @@ namespace Nz
 	template<typename E, typename V> 
 	constexpr typename EnumArray<E, V>::kv_iterator EnumArray<E, V>::kv_iter_tag::end() noexcept
 	{
-		return EnumArray<E, V>::kv_iterator(*this, arrayRef.size());
+		return EnumArray<E, V>::kv_iterator(*this, arrayRef->size());
 	}
 
 	template<typename E, typename V>
@@ -52,7 +52,7 @@ namespace Nz
 	template<typename E, typename V>
 	constexpr typename EnumArray<E, V>::kv_const_iterator EnumArray<E, V>::kv_const_iter_tag::end() const noexcept
 	{
-		return EnumArray<E, V>::kv_const_iterator(*this, arrayRef.size());
+		return EnumArray<E, V>::kv_const_iterator(*this, arrayRef->size());
 	}
 
 
@@ -125,55 +125,55 @@ namespace Nz
 	constexpr auto EnumArrayKvIterator<E, V, Const>::operator*() const noexcept -> value_type
 	{
 		E enumKey = static_cast<E>(m_index);
-		return std::make_pair(enumKey, std::ref(m_array[enumKey]));
+		return std::make_pair(enumKey, std::ref((*m_array)[enumKey]));
 	}
 
 	template<typename E, typename V, bool Const>
 	constexpr auto EnumArrayKvIterator<E, V, Const>::operator[](difference_type n) const noexcept -> value_type
 	{
 		E enumKey = static_cast<E>(m_index + n);
-		return std::make_pair(enumKey, std::ref(m_array[enumKey]));
+		return std::make_pair(enumKey, std::ref((*m_array)[enumKey]));
 	}
 
 	template<typename E, typename V, bool Const>
 	constexpr bool EnumArrayKvIterator<E, V, Const>::operator==(const EnumArrayKvIterator& rhs) const noexcept
 	{
-		assert(&m_array == &rhs.m_array);
+		assert(m_array == rhs.m_array);
 		return m_index == rhs.m_index;
 	}
 
 	template<typename E, typename V, bool Const>
 	constexpr bool EnumArrayKvIterator<E, V, Const>::operator!=(const EnumArrayKvIterator& rhs) const noexcept
 	{
-		assert(&m_array == &rhs.m_array);
+		assert(m_array == rhs.m_array);
 		return m_index != rhs.m_index;
 	}
 
 	template<typename E, typename V, bool Const>
 	constexpr bool EnumArrayKvIterator<E, V, Const>::operator<(const EnumArrayKvIterator& rhs) const noexcept
 	{
-		assert(&m_array == &rhs.m_array);
+		assert(m_array == rhs.m_array);
 		return m_index < rhs.m_index;
 	}
 
 	template<typename E, typename V, bool Const>
 	constexpr bool EnumArrayKvIterator<E, V, Const>::operator<=(const EnumArrayKvIterator& rhs) const noexcept
 	{
-		assert(&m_array == &rhs.m_array);
+		assert(m_array == rhs.m_array);
 		return m_index <= rhs.m_index;
 	}
 
 	template<typename E, typename V, bool Const>
 	constexpr bool EnumArrayKvIterator<E, V, Const>::operator>(const EnumArrayKvIterator& rhs) const noexcept
 	{
-		assert(&m_array == &rhs.m_array);
+		assert(m_array == rhs.m_array);
 		return m_index > rhs.m_index;
 	}
 
 	template<typename E, typename V, bool Const>
 	constexpr bool EnumArrayKvIterator<E, V, Const>::operator>=(const EnumArrayKvIterator& rhs) const noexcept
 	{
-		assert(&m_array == &rhs.m_array);
+		assert(m_array == rhs.m_array);
 		return m_index >= rhs.m_index;
 	}