Merge pull request Tencent#671 from crazytuzi/develop

xuyanghuang-tencent · web-flow · commit 5aba6acd2091 · 2023-11-09T10:05:01.000+08:00
Fixed 5.2.1 compile error
diff --git a/Plugins/UnLua/Source/UnLua/Private/LuaFunction.cpp b/Plugins/UnLua/Source/UnLua/Private/LuaFunction.cpp
@@ -286,7 +286,7 @@ void ULuaFunction::Bind()
     }
     else
     {
-#if UE_VERSION_NEWER_THAN(5, 2, 0)
+#if UE_VERSION_NEWER_THAN(5, 2, 1)
         Super::Bind();
 #else
         SetNativeFunc(ProcessInternal);
diff --git a/Plugins/UnLua/Source/UnLua/Private/LuaOverridesClass.cpp b/Plugins/UnLua/Source/UnLua/Private/LuaOverridesClass.cpp
@@ -67,7 +67,7 @@ void ULuaOverridesClass::AddToOwner()
     if (!Class)
         return;
 
-#if UE_VERSION_NEWER_THAN(5, 2, 0)
+#if UE_VERSION_NEWER_THAN(5, 2, 1)
     auto ChildrenPtr = Class->Children.Get();
 
     auto Field = &ChildrenPtr;
@@ -97,7 +97,7 @@ void ULuaOverridesClass::RemoveFromOwner()
     if (!Class)
         return;
 
-#if UE_VERSION_NEWER_THAN(5, 2, 0)
+#if UE_VERSION_NEWER_THAN(5, 2, 1)
     auto ChildrenPtr = Class->Children.Get();
 
     auto Field = &ChildrenPtr;
diff --git a/Plugins/UnLua/Source/UnLua/Private/Registries/PropertyRegistry.cpp b/Plugins/UnLua/Source/UnLua/Private/Registries/PropertyRegistry.cpp
@@ -110,13 +110,13 @@ namespace UnLua
 #endif
                 nullptr,
                 nullptr,
-#if UE_VERSION_NEWER_THAN(5, 2, 0)
+#if UE_VERSION_NEWER_THAN(5, 2, 1)
                 1,
 #endif
                 sizeof(bool),
                 sizeof(FPropertyCollector),
                 nullptr,
-#if UE_VERSION_NEWER_THAN(5, 2, 0)
+#if UE_VERSION_NEWER_THAN(5, 2, 1)
                 METADATA_PARAMS(0, nullptr)
 #else
                 METADATA_PARAMS(nullptr, 0)
@@ -148,11 +148,11 @@ namespace UnLua
 #endif
                 nullptr,
                 nullptr,
-#if UE_VERSION_NEWER_THAN(5, 2, 0)
+#if UE_VERSION_NEWER_THAN(5, 2, 1)
                 1,
 #endif
                 0,
-#if UE_VERSION_NEWER_THAN(5, 2, 0)
+#if UE_VERSION_NEWER_THAN(5, 2, 1)
                 METADATA_PARAMS(0, nullptr)
 #else
                 METADATA_PARAMS(nullptr, 0)
@@ -184,11 +184,11 @@ namespace UnLua
 #endif
                 nullptr,
                 nullptr,
-#if UE_VERSION_NEWER_THAN(5, 2, 0)
+#if UE_VERSION_NEWER_THAN(5, 2, 1)
                 1,
 #endif
                 0,
-#if UE_VERSION_NEWER_THAN(5, 2, 0)
+#if UE_VERSION_NEWER_THAN(5, 2, 1)
                 METADATA_PARAMS(0, nullptr)
 #else
                 METADATA_PARAMS(nullptr, 0)
@@ -220,11 +220,11 @@ namespace UnLua
 #endif
                 nullptr,
                 nullptr,
-#if UE_VERSION_NEWER_THAN(5, 2, 0)
+#if UE_VERSION_NEWER_THAN(5, 2, 1)
                 1,
 #endif
                 0,
-#if UE_VERSION_NEWER_THAN(5, 2, 0)
+#if UE_VERSION_NEWER_THAN(5, 2, 1)
                 METADATA_PARAMS(0, nullptr)
 #else
                 METADATA_PARAMS(nullptr, 0)
@@ -256,11 +256,11 @@ namespace UnLua
 #endif
                 nullptr,
                 nullptr,
-#if UE_VERSION_NEWER_THAN(5, 2, 0)
+#if UE_VERSION_NEWER_THAN(5, 2, 1)
                 1,
 #endif
                 0,
-#if UE_VERSION_NEWER_THAN(5, 2, 0)
+#if UE_VERSION_NEWER_THAN(5, 2, 1)
                 METADATA_PARAMS(0, nullptr)
 #else
                 METADATA_PARAMS(nullptr, 0)
@@ -292,17 +292,17 @@ namespace UnLua
 #endif
                 nullptr,
                 nullptr,
-#if UE_VERSION_NEWER_THAN(5, 2, 0)
+#if UE_VERSION_NEWER_THAN(5, 2, 1)
                 1,
 #endif
                 0,
-#if UE_VERSION_NEWER_THAN(5, 2, 0)
+#if UE_VERSION_NEWER_THAN(5, 2, 1)
                 METADATA_PARAMS(0, nullptr)
 #else
                 METADATA_PARAMS(nullptr, 0)
 #endif
             };
-#if UE_VERSION_NEWER_THAN(5, 2, 0)
+#if UE_VERSION_NEWER_THAN(5, 2, 1)
             const auto Property = new FTextProperty(PropertyCollector, "", RF_Transient);
 #else
             const auto Property = new FTextProperty(PropertyCollector, Params);
@@ -336,12 +336,12 @@ namespace UnLua
 #endif
                 nullptr,
                 nullptr,
-#if UE_VERSION_NEWER_THAN(5, 2, 0)
+#if UE_VERSION_NEWER_THAN(5, 2, 1)
                 1,
 #endif
                 0,
                 nullptr,
-#if UE_VERSION_NEWER_THAN(5, 2, 0)
+#if UE_VERSION_NEWER_THAN(5, 2, 1)
                 METADATA_PARAMS(0, nullptr)
 #else
                 METADATA_PARAMS(nullptr, 0)
@@ -371,12 +371,12 @@ namespace UnLua
 #endif
                 nullptr,
                 nullptr,
-#if UE_VERSION_NEWER_THAN(5, 2, 0)
+#if UE_VERSION_NEWER_THAN(5, 2, 1)
                 1,
 #endif
                 0,
                 nullptr,
-#if UE_VERSION_NEWER_THAN(5, 2, 0)
+#if UE_VERSION_NEWER_THAN(5, 2, 1)
                 METADATA_PARAMS(0, nullptr)
 #else
                 METADATA_PARAMS(nullptr, 0)

Original file line number	Diff line number	Diff line change
`@@ -286,7 +286,7 @@ void ULuaFunction::Bind()`
`286`	`286`	`}`
`287`	`287`	`else`
`288`	`288`	`{`
`289`		`-#if UE_VERSION_NEWER_THAN(5, 2, 0)`
	`289`	`+#if UE_VERSION_NEWER_THAN(5, 2, 1)`
`290`	`290`	`Super::Bind();`
`291`	`291`	`#else`
`292`	`292`	`SetNativeFunc(ProcessInternal);`