Fix pre-5.5 compatibility

slonopotamus · Nov 15, 2024 · cc7c9be · cc7c9be
1 parent 4953514
commit cc7c9be
Show file tree

Hide file tree

Showing 3 changed files with 4 additions and 4 deletions.
diff --git a/Source/UEST/Private/ScopedGame.cpp b/Source/UEST/Private/ScopedGame.cpp
@@ -110,15 +110,15 @@ FScopedGameInstance::~FScopedGameInstance()
 	}
 }
 
-#if ENGINE_MAJOR_VERSION > 5 || (ENGINE_MAJOR_VERSION == 5 && ENGINE_MAJOR_VERSION >= 5)
+#if ENGINE_MAJOR_VERSION > 5 || (ENGINE_MAJOR_VERSION == 5 && ENGINE_MINOR_VERSION >= 5)
 struct FGPlayInEditorIDGuard final : UE::Core::Private::FPlayInEditorLoadingScope
 {
 	explicit FGPlayInEditorIDGuard(const int32 PlayInEditorID)
 		: FPlayInEditorLoadingScope(PlayInEditorID)
 	{}
 };
 #else
-struct FGPlayInEditorIDGuard final : TGuardValue<int32>
+struct FGPlayInEditorIDGuard final : TGuardValue<FPlayInEditorID, int32>
 {
 	explicit FGPlayInEditorIDGuard(const int32 PlayInEditorID)
 		: TGuardValue(GPlayInEditorID, PlayInEditorID)

diff --git a/Source/UEST/Private/UEST.cpp b/Source/UEST/Private/UEST.cpp
@@ -12,7 +12,7 @@ uint32 FUESTTestBase::GetRequiredDeviceNum() const
 	return 1;
 }
 
-#if ENGINE_MAJOR_VERSION > 5 || (ENGINE_MAJOR_VERSION == 5 && ENGINE_MAJOR_VERSION >= 5)
+#if ENGINE_MAJOR_VERSION > 5 || (ENGINE_MAJOR_VERSION == 5 && ENGINE_MINOR_VERSION >= 5)
 EAutomationTestFlags FUESTTestBase::GetTestFlags() const
 {
 	return EAutomationTestFlags_ApplicationContextMask | EAutomationTestFlags::ProductFilter;

diff --git a/Source/UEST/Public/UEST.h b/Source/UEST/Public/UEST.h
@@ -433,7 +433,7 @@ class UEST_API FUESTTestBase : public FAutomationTestBase
 
 	virtual uint32 GetRequiredDeviceNum() const override;
 
-#if ENGINE_MAJOR_VERSION > 5 || (ENGINE_MAJOR_VERSION == 5 && ENGINE_MAJOR_VERSION >= 5)
+#if ENGINE_MAJOR_VERSION > 5 || (ENGINE_MAJOR_VERSION == 5 && ENGINE_MINOR_VERSION >= 5)
 	virtual EAutomationTestFlags GetTestFlags() const override;
 #else
 	virtual uint32 GetTestFlags() const override;