Unreal upgrade fixes (#40)

* Pushing a number of engine upgrade fixes upstream

* Added some additional test changes

Source/SDFutureExtensions/Private/FutureExtensionsStaticFuncs.cpp

@@ -56,7 +56,7 @@ SD::TExpectedFuture<void> SD::WaitAsync(const float DelayInSeconds)
 {
 	const TSharedRef<TExpectedPromise<void>> Promise = MakeShared<TExpectedPromise<void>>();
 
-	FTicker::GetCoreTicker().AddTicker(
+	FTSTicker::GetCoreTicker().AddTicker(
 		FTickerDelegate::CreateLambda([Promise](const float Delta)
 	{
 		Promise->SetValue();

Source/SDFutureExtensions/Public/ExpectedFuture.h

@@ -2,7 +2,7 @@
 #pragma once
 
 #include "Async/Future.h"
-#include "SDFutureExtensions/Private/FutureExtensionsTypeTraits.h"
+#include "FutureExtensionsTypeTraits.h"
 #include "Templates/AreTypesEqual.h"
 #include "Async/TaskGraphInterfaces.h"
 #include "Misc/QueuedThreadPool.h"
@@ -648,15 +648,15 @@ namespace SD
 		return ValuePromise.GetFuture();
 	}
 
-	template <typename T, typename R, typename TEnableIf<TIsSame<T, R>::Value>::Type* = nullptr>
+	template <typename T, typename R, typename TEnableIf<std::is_same_v<T, R>>::Type* = nullptr>
 	TExpectedFuture<T> MakeReadyFutureFromExpected(const TExpected<R>& InExpected)
 	{
 		TExpectedPromise<T> Promise = TExpectedPromise<T>();
 		Promise.SetValue(InExpected);
 		return Promise.GetFuture();
 	}
 
-	template <typename T, typename R, typename TEnableIf<!TIsSame<T, R>::Value>::Type* = nullptr>
+	template <typename T, typename R, typename TEnableIf<!std::is_same_v<T, R>>::Type* = nullptr>
 	TExpectedFuture<T> MakeReadyFutureFromExpected(const TExpected<R>& InExpected)
 	{
 		return MakeReadyFuture<T>(Convert<T>(InExpected));

Source/SDFutureExtensions/Private/FutureExtensionTaskGraph.h → Source/SDFutureExtensions/Public/FutureExtensionTaskGraph.h

@@ -3,6 +3,7 @@
 
 #include "Async/Async.h"
 #include "CancellationHandle.h"
+#include <type_traits>
 
 //TODO: can be rewriten with C++17 `if constexpr`
 
@@ -319,7 +320,7 @@ namespace SD
 		class TExpectedFutureInitTask : public FAsyncGraphTaskBase
 		{
 			using SharedPromiseRef = TSharedRef<TExpectedPromise<R>, ESPMode::ThreadSafe>;
-			using FFunctorType = typename TRemoveCV<typename TRemoveReference<F>::Type>::Type;
+			using FFunctorType = TRemoveCVRef<F>;
 
 		public:
 			TExpectedFutureInitTask(F&& InFunc, const SharedPromiseRef& InPromise,
@@ -354,7 +355,7 @@ namespace SD
 		class TExpectedFutureContinuationTask : public FAsyncGraphTaskBase
 		{
 			using SharedPromiseRef = TSharedRef<TExpectedPromise<R>, ESPMode::ThreadSafe>;
-			using FFunctorType = typename TRemoveCV<typename TRemoveReference<F>::Type>::Type;
+			using FFunctorType = TRemoveCVRef<F>;
 
 		public:
 			TExpectedFutureContinuationTask(F&& InFunction, const SharedPromiseRef& InPromise,
@@ -460,7 +461,7 @@ namespace SD
 		class TExpectedFutureInitQueuedWork : public TExpectedFutureQueuedWork<R>
 		{
 			using SharedPromiseRef = TSharedRef<TExpectedPromise<R>, ESPMode::ThreadSafe>;
-			using FFunctorType = typename TRemoveCV<typename TRemoveReference<F>::Type>::Type;
+			using FFunctorType = TRemoveCVRef<F>;
 
 		public:
 			TExpectedFutureInitQueuedWork(F&& InFunc, const SharedPromiseRef& InPromise,
@@ -492,7 +493,7 @@ namespace SD
 		class TExpectedFutureContinuationQueuedWork : public TExpectedFutureQueuedWork<R>
 		{
 			using SharedPromiseRef = TSharedRef<TExpectedPromise<R>, ESPMode::ThreadSafe>;
-			using FFunctorType = typename TRemoveCV<typename TRemoveReference<F>::Type>::Type;
+			using FFunctorType = TRemoveCVRef<F>;
 
 		public:
 			TExpectedFutureContinuationQueuedWork(F&& InFunction, const SharedPromiseRef& InPromise,

Source/SDFutureExtensions/Public/FutureExtensions.h

@@ -5,5 +5,5 @@
 #include "ExpectedResult.h"
 #include "ExpectedFutureOptions.h"
 #include "ExpectedFuture.h"
-#include "SDFutureExtensions/Private/FutureExtensionTaskGraph.h"
+#include "FutureExtensionTaskGraph.h"
 #include "FutureExtensionsStaticFuncs.h"

Source/SDFutureExtensions/Public/FutureExtensionsStaticFuncs.h

@@ -4,7 +4,7 @@
 
 #include "ExpectedResult.h"
 #include "ExpectedFuture.h"
-#include "SDFutureExtensions/Private/FutureExtensionTaskGraph.h"
+#include "FutureExtensionTaskGraph.h"
 
 namespace SD
 {

Source/SDFutureExtensions/Private/FutureExtensionsTypeTraits.h → Source/SDFutureExtensions/Public/FutureExtensionsTypeTraits.h

@@ -17,6 +17,12 @@ namespace SD
 
 	namespace FutureExtensionTypeTraits
 	{
+		/**
+		 * Cannot use std::remove_cvref_t as this is not available in all SDKs 
+		 */
+		template <class T>
+		using TRemoveCVRef = std::remove_cv_t<std::remove_reference_t<T>>;
+
 		/*
 		*	Helper type traits for determining if types are either Expected or ExpectedFuture.
 		*	Required as certain functionality (such as implicit unwrapping of futures/types) requires
@@ -87,17 +93,17 @@ namespace SD
 
 			using IsPlainValueOrExpected = TIntegralConstant<bool,	!IsExpectedFuture::value &&
 																	(TIsExpected<ReturnType>::value ||
-																	!TIsVoidType<ReturnType>::Value)>;
+																	!std::is_void<ReturnType>::value)>;
 
 			using IsNonExpectedAndVoid = TIntegralConstant<bool, !TIsExpected<ReturnType>::value &&
-																TIsVoidType<ReturnType>::Value>;
+																std::is_void<ReturnType>::value>;
 		};
 
 		template<typename ParamType>
 		struct TParamTypeSpecializations
 		{
-			using IsVoidValueBased = TIsVoidType<ParamType>;
-			using IsNonVoidValueBased = TIntegralConstant<bool, !TIsVoidType<ParamType>::Value && 
+			using IsVoidValueBased = std::is_void<ParamType>;
+			using IsNonVoidValueBased = TIntegralConstant<bool, !std::is_void<ParamType>::value &&
 																!TIsExpected<ParamType>::value>;
 			using IsExpectedBased = TIsExpected<ParamType>;
 		};
@@ -172,7 +178,7 @@ namespace SD
 		struct TContinuationFunctorReturnType {};
 
 		template<typename F, typename P>
-		struct TContinuationFunctorReturnType<F, P, typename TEnableIf<!TIsVoidType<P>::Value>::Type>
+		struct TContinuationFunctorReturnType<F, P, typename TEnableIf<!std::is_void<P>::value>::Type>
 		{
 #if ENGINE_MAJOR_VERSION >= 4 && ENGINE_MINOR_VERSION >= 26 && ENGINE_PATCH_VERSION >= 1
 			using ReturnType = typename TInvokeResult<typename std::decay_t<F>, P>::Type;
@@ -184,7 +190,7 @@ namespace SD
 		};
 
 		template<typename F, typename P>
-		struct TContinuationFunctorReturnType<F, P, typename TEnableIf<TIsVoidType<P>::Value>::Type>
+		struct TContinuationFunctorReturnType<F, P, typename TEnableIf<std::is_void<P>::value>::Type>
 		{
 #if ENGINE_MAJOR_VERSION >= 4 && ENGINE_MINOR_VERSION >= 26 && ENGINE_PATCH_VERSION >= 1
 			using ReturnType = typename TInvokeResult<typename std::decay_t<F>>::Type;
@@ -205,7 +211,7 @@ namespace SD
 
 			using IsReturnsVoidAndTakesVoid =
 				TIntegralConstant<bool, ReturnSpec::IsNonExpectedAndVoid::Value &&
-										ParamSpec::IsVoidValueBased::Value>;
+										ParamSpec::IsVoidValueBased::value>;
 
 			using IsReturnsVoidAndTakesValue =
 				TIntegralConstant<bool, ReturnSpec::IsNonExpectedAndVoid::Value &&
@@ -217,7 +223,7 @@ namespace SD
 
 			using IsReturnsExpectedFutureAndTakesVoid =
 				TIntegralConstant<bool, ReturnSpec::IsExpectedFuture::value &&
-										ParamSpec::IsVoidValueBased::Value>;
+										ParamSpec::IsVoidValueBased::value>;
 
 			using IsReturnsExpectedFutureAndTakesValue =
 				TIntegralConstant<bool, ReturnSpec::IsExpectedFuture::value &&
@@ -229,7 +235,7 @@ namespace SD
 
 			using IsReturnsPlainValueOrExpectedAndTakesVoid =
 				TIntegralConstant<bool, ReturnSpec::IsPlainValueOrExpected::Value &&
-										ParamSpec::IsVoidValueBased::Value>;
+										ParamSpec::IsVoidValueBased::value>;
 
 			using IsReturnsPlainValueOrExpectedAndTakesValue =
 				TIntegralConstant<bool, ReturnSpec::IsPlainValueOrExpected::Value &&

Source/Test/Private/BasicFutures.spec.cpp

@@ -76,7 +76,7 @@ void FFutureTestSpec_Basic::Define()
 		{
 			return 10;
 		})
-		.Then([](SD::TExpected<int32> Expected)
+		.Then([](SD::TExpected<int32> Expected) -> SD::TExpected<int32>
 		{
 			//Pass initial result straight through
 			return Expected;

Source/Test/Private/Cancellation.spec.cpp

@@ -150,7 +150,7 @@ void FFutureTestSpec_Cancellation::Define()
 		{
 			return Expected;
 		}, SD::FExpectedFutureOptions(CancellationHandle))
-		.Then([](SD::TExpected<int32> Expected)
+		.Then([](SD::TExpected<int32> Expected) -> SD::TExpected<bool>
 		{
 			//Then expected-based continuation is called with "Cancelled" status
 			return SD::MakeReadyExpected<bool>(Expected.IsCancelled());

Source/Test/Private/CombinedFutures.spec.cpp

@@ -5,7 +5,6 @@
 
 #include "Helpers/TestHelpers.h"
 
-
 #if WITH_DEV_AUTOMATION_TESTS
 
 /************************************************************************/
@@ -14,7 +13,7 @@
 
 class FFutureTestSpec_Combined : public FFutureTestSpec
 {
-	GENERATE_SPEC(FFutureTestSpec_Basic, "FutureExtensions.Combined",
+	GENERATE_SPEC(FFutureTestSpec_Combined, "FutureExtensions.Combined",
 		EAutomationTestFlags::ProductFilter |
 		EAutomationTestFlags::EditorContext |
 		EAutomationTestFlags::ServerContext

Source/Test/Private/ExecutionPolicy.spec.cpp

@@ -91,7 +91,7 @@ void FFutureTestSpec_ExecutionPolicy::Define()
 			.SetExecutionPolicy(SD::EExpectedFutureExecutionPolicy::NamedThread)
 			.SetDesiredExecutionThread(ENamedThreads::GameThread)
 			.Build())
-		.Then([](SD::TExpected<void> Expected)
+		.Then([](SD::TExpected<void> Expected) -> SD::TExpected<ENamedThreads::Type>
 		{
 			return SD::MakeReadyExpected(FTaskGraphInterface::Get().GetCurrentThreadIfKnown());
 		}, SD::FExpectedFutureOptionsBuilder()
@@ -127,7 +127,7 @@ void FFutureTestSpec_ExecutionPolicy::Define()
 		{
 			return SD::MakeReadyExpected();
 		})
-		.Then([](SD::TExpected<void> Expected)
+		.Then([](SD::TExpected<void> Expected) -> SD::TExpected<ENamedThreads::Type>
 		{
 			return SD::MakeReadyExpected(FTaskGraphInterface::Get().GetCurrentThreadIfKnown());
 		}, SD::FExpectedFutureOptionsBuilder()