From 988e0335a0e5cd0e0f30b156785a50814f2a3d4a Mon Sep 17 00:00:00 2001
From: _Redstone_c_ <myredstone1024@gmail.com>
Date: Thu, 7 Apr 2022 14:52:41 +0800
Subject: [PATCH] fix(templates): fix Invoke selects the wrong operation when
 the function has specifiers

---
 .../Source/Public/Templates/Invoke.h          | 19 ++++++++++---------
 1 file changed, 10 insertions(+), 9 deletions(-)

diff --git a/Redcraft.Utility/Source/Public/Templates/Invoke.h b/Redcraft.Utility/Source/Public/Templates/Invoke.h
index af53d68..34e213f 100644
--- a/Redcraft.Utility/Source/Public/Templates/Invoke.h
+++ b/Redcraft.Utility/Source/Public/Templates/Invoke.h
@@ -14,7 +14,7 @@ struct InvokeFunction
 	template <typename F, typename... Types>
 	static auto Invoke(F&& Object, Types&&... Args)
 	{
-		return Object(Forward<Types>(Args)...);
+		return Forward<F>(Object)(Forward<Types>(Args)...);
 	}
 };
 
@@ -22,16 +22,16 @@ struct InvokeMemberFunction
 {
 	template <typename F, typename ObjectType, typename... Types>
 	static auto Invoke(F&& Func, ObjectType&& Object, Types&&... Args) ->
-		decltype((Object->*Func)(Forward<Types>(Args)...))
+		decltype((Forward<ObjectType>(Object)->*Func)(Forward<Types>(Args)...))
 	{
-		return (Object->*Func)(Forward<Types>(Args)...);
+		return (Forward<ObjectType>(Object)->*Func)(Forward<Types>(Args)...);
 	}
 
 	template <typename F, typename ObjectType, typename... Types>
 	static auto Invoke(F&& Func, ObjectType&& Object, Types&&... Args) ->
-		decltype((Object.*Func)(Forward<Types>(Args)...))
+		decltype((Forward<ObjectType>(Object).*Func)(Forward<Types>(Args)...))
 	{
-		return (Object.*Func)(Forward<Types>(Args)...);
+		return (Forward<ObjectType>(Object).*Func)(Forward<Types>(Args)...);
 	}
 };
 
@@ -39,16 +39,16 @@ struct InvokeMemberObject
 {
 	template <typename F, typename ObjectType>
 	static auto Invoke(F&& Func, ObjectType&& Object) ->
-		decltype(Object->*Func)
+		decltype(Forward<ObjectType>(Object)->*Func)
 	{
-		return (Object->*Func);
+		return (Forward<ObjectType>(Object)->*Func);
 	}
 
 	template <typename F, typename ObjectType>
 	static auto Invoke(F&& Func, ObjectType&& Object) ->
-		decltype(Object.*Func)
+		decltype(Forward<ObjectType>(Object).*Func)
 	{
-		return (Object.*Func);
+		return (Forward<ObjectType>(Object).*Func);
 	}
 };
 
@@ -81,6 +81,7 @@ NAMESPACE_PRIVATE_END
 
 template <typename F, typename... Types> requires TIsInvocable<F, Types...>::Value
 constexpr auto Invoke(F&& Func, Types&&... Args)
+	-> decltype(NAMESPACE_PRIVATE::InvokeImpl<F, Types...>::Invoke(Forward<F>(Func), Forward<Types>(Args)...))
 {
 	return NAMESPACE_PRIVATE::InvokeImpl<F, Types...>::Invoke(Forward<F>(Func), Forward<Types>(Args)...);
 }