From d1841356bfff2b1404a4a6e44898bb17c9457fff Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?J=C3=A9r=C3=B4me=20Leclercq?= <lynix680@gmail.com>
Date: Wed, 29 Dec 2021 14:35:26 +0100
Subject: [PATCH] Core/Algorithm: Improve AccessByOffset check and add error
 message

---
 include/Nazara/Core/Algorithm.inl | 16 +++++++++-------
 1 file changed, 9 insertions(+), 7 deletions(-)

diff --git a/include/Nazara/Core/Algorithm.inl b/include/Nazara/Core/Algorithm.inl
index 600d44825..e238c73e7 100644
--- a/include/Nazara/Core/Algorithm.inl
+++ b/include/Nazara/Core/Algorithm.inl
@@ -49,12 +49,12 @@ namespace Nz
 	template<typename T>
 	decltype(auto) AccessByOffset(void* basePtr, std::size_t offset)
 	{
-		static_assert((std::is_reference_v<T> && !std::is_rvalue_reference_v<T>) || std::is_pointer_v<T>);
-
-		if constexpr (std::is_reference_v<T>)
+		if constexpr (std::is_lvalue_reference_v<T>)
 			return *reinterpret_cast<std::remove_reference_t<T>*>(static_cast<Nz::UInt8*>(basePtr) + offset);
-		else
+		else if constexpr (std::is_pointer_v<T>)
 			return reinterpret_cast<T>(static_cast<Nz::UInt8*>(basePtr) + offset);
+		else
+			static_assert(AlwaysFalse<T>(), "AccessByOffset requires a reference or pointer type");
 	}
 
 	/*!
@@ -68,12 +68,14 @@ namespace Nz
 	template<typename T>
 	decltype(auto) AccessByOffset(const void* basePtr, std::size_t offset)
 	{
-		static_assert((std::is_reference_v<T> && !std::is_rvalue_reference_v<T>) || std::is_pointer_v<T>);
+		static_assert(std::is_lvalue_reference_v<T> || std::is_pointer_v<T>);
 
-		if constexpr (std::is_reference_v<T>)
+		if constexpr (std::is_lvalue_reference_v<T>)
 			return *reinterpret_cast<std::remove_reference_t<T>*>(static_cast<const Nz::UInt8*>(basePtr) + offset);
-		else
+		else if constexpr (std::is_pointer_v<T>)
 			return reinterpret_cast<T>(static_cast<const Nz::UInt8*>(basePtr) + offset);
+		else
+			static_assert(AlwaysFalse<T>(), "AccessByOffset requires a reference or pointer type");
 	}
 
 	/*!