Skip to content

Commit 5aba6ac

Browse files
Merge pull request Tencent#671 from crazytuzi/develop
Fixed 5.2.1 compile error
2 parents 2e0a06c + eef33eb commit 5aba6ac

File tree

3 files changed

+20
-20
lines changed

3 files changed

+20
-20
lines changed

Plugins/UnLua/Source/UnLua/Private/LuaFunction.cpp

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -286,7 +286,7 @@ void ULuaFunction::Bind()
286286
}
287287
else
288288
{
289-
#if UE_VERSION_NEWER_THAN(5, 2, 0)
289+
#if UE_VERSION_NEWER_THAN(5, 2, 1)
290290
Super::Bind();
291291
#else
292292
SetNativeFunc(ProcessInternal);

Plugins/UnLua/Source/UnLua/Private/LuaOverridesClass.cpp

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -67,7 +67,7 @@ void ULuaOverridesClass::AddToOwner()
6767
if (!Class)
6868
return;
6969

70-
#if UE_VERSION_NEWER_THAN(5, 2, 0)
70+
#if UE_VERSION_NEWER_THAN(5, 2, 1)
7171
auto ChildrenPtr = Class->Children.Get();
7272

7373
auto Field = &ChildrenPtr;
@@ -97,7 +97,7 @@ void ULuaOverridesClass::RemoveFromOwner()
9797
if (!Class)
9898
return;
9999

100-
#if UE_VERSION_NEWER_THAN(5, 2, 0)
100+
#if UE_VERSION_NEWER_THAN(5, 2, 1)
101101
auto ChildrenPtr = Class->Children.Get();
102102

103103
auto Field = &ChildrenPtr;

Plugins/UnLua/Source/UnLua/Private/Registries/PropertyRegistry.cpp

Lines changed: 17 additions & 17 deletions
Original file line numberDiff line numberDiff line change
@@ -110,13 +110,13 @@ namespace UnLua
110110
#endif
111111
nullptr,
112112
nullptr,
113-
#if UE_VERSION_NEWER_THAN(5, 2, 0)
113+
#if UE_VERSION_NEWER_THAN(5, 2, 1)
114114
1,
115115
#endif
116116
sizeof(bool),
117117
sizeof(FPropertyCollector),
118118
nullptr,
119-
#if UE_VERSION_NEWER_THAN(5, 2, 0)
119+
#if UE_VERSION_NEWER_THAN(5, 2, 1)
120120
METADATA_PARAMS(0, nullptr)
121121
#else
122122
METADATA_PARAMS(nullptr, 0)
@@ -148,11 +148,11 @@ namespace UnLua
148148
#endif
149149
nullptr,
150150
nullptr,
151-
#if UE_VERSION_NEWER_THAN(5, 2, 0)
151+
#if UE_VERSION_NEWER_THAN(5, 2, 1)
152152
1,
153153
#endif
154154
0,
155-
#if UE_VERSION_NEWER_THAN(5, 2, 0)
155+
#if UE_VERSION_NEWER_THAN(5, 2, 1)
156156
METADATA_PARAMS(0, nullptr)
157157
#else
158158
METADATA_PARAMS(nullptr, 0)
@@ -184,11 +184,11 @@ namespace UnLua
184184
#endif
185185
nullptr,
186186
nullptr,
187-
#if UE_VERSION_NEWER_THAN(5, 2, 0)
187+
#if UE_VERSION_NEWER_THAN(5, 2, 1)
188188
1,
189189
#endif
190190
0,
191-
#if UE_VERSION_NEWER_THAN(5, 2, 0)
191+
#if UE_VERSION_NEWER_THAN(5, 2, 1)
192192
METADATA_PARAMS(0, nullptr)
193193
#else
194194
METADATA_PARAMS(nullptr, 0)
@@ -220,11 +220,11 @@ namespace UnLua
220220
#endif
221221
nullptr,
222222
nullptr,
223-
#if UE_VERSION_NEWER_THAN(5, 2, 0)
223+
#if UE_VERSION_NEWER_THAN(5, 2, 1)
224224
1,
225225
#endif
226226
0,
227-
#if UE_VERSION_NEWER_THAN(5, 2, 0)
227+
#if UE_VERSION_NEWER_THAN(5, 2, 1)
228228
METADATA_PARAMS(0, nullptr)
229229
#else
230230
METADATA_PARAMS(nullptr, 0)
@@ -256,11 +256,11 @@ namespace UnLua
256256
#endif
257257
nullptr,
258258
nullptr,
259-
#if UE_VERSION_NEWER_THAN(5, 2, 0)
259+
#if UE_VERSION_NEWER_THAN(5, 2, 1)
260260
1,
261261
#endif
262262
0,
263-
#if UE_VERSION_NEWER_THAN(5, 2, 0)
263+
#if UE_VERSION_NEWER_THAN(5, 2, 1)
264264
METADATA_PARAMS(0, nullptr)
265265
#else
266266
METADATA_PARAMS(nullptr, 0)
@@ -292,17 +292,17 @@ namespace UnLua
292292
#endif
293293
nullptr,
294294
nullptr,
295-
#if UE_VERSION_NEWER_THAN(5, 2, 0)
295+
#if UE_VERSION_NEWER_THAN(5, 2, 1)
296296
1,
297297
#endif
298298
0,
299-
#if UE_VERSION_NEWER_THAN(5, 2, 0)
299+
#if UE_VERSION_NEWER_THAN(5, 2, 1)
300300
METADATA_PARAMS(0, nullptr)
301301
#else
302302
METADATA_PARAMS(nullptr, 0)
303303
#endif
304304
};
305-
#if UE_VERSION_NEWER_THAN(5, 2, 0)
305+
#if UE_VERSION_NEWER_THAN(5, 2, 1)
306306
const auto Property = new FTextProperty(PropertyCollector, "", RF_Transient);
307307
#else
308308
const auto Property = new FTextProperty(PropertyCollector, Params);
@@ -336,12 +336,12 @@ namespace UnLua
336336
#endif
337337
nullptr,
338338
nullptr,
339-
#if UE_VERSION_NEWER_THAN(5, 2, 0)
339+
#if UE_VERSION_NEWER_THAN(5, 2, 1)
340340
1,
341341
#endif
342342
0,
343343
nullptr,
344-
#if UE_VERSION_NEWER_THAN(5, 2, 0)
344+
#if UE_VERSION_NEWER_THAN(5, 2, 1)
345345
METADATA_PARAMS(0, nullptr)
346346
#else
347347
METADATA_PARAMS(nullptr, 0)
@@ -371,12 +371,12 @@ namespace UnLua
371371
#endif
372372
nullptr,
373373
nullptr,
374-
#if UE_VERSION_NEWER_THAN(5, 2, 0)
374+
#if UE_VERSION_NEWER_THAN(5, 2, 1)
375375
1,
376376
#endif
377377
0,
378378
nullptr,
379-
#if UE_VERSION_NEWER_THAN(5, 2, 0)
379+
#if UE_VERSION_NEWER_THAN(5, 2, 1)
380380
METADATA_PARAMS(0, nullptr)
381381
#else
382382
METADATA_PARAMS(nullptr, 0)

0 commit comments

Comments
 (0)