diff --git a/Plugins/UnLua/Source/ThirdParty/Lua/Lua.Build.cs b/Plugins/UnLua/Source/ThirdParty/Lua/Lua.Build.cs index 240aada7..7e9be6eb 100644 --- a/Plugins/UnLua/Source/ThirdParty/Lua/Lua.Build.cs +++ b/Plugins/UnLua/Source/ThirdParty/Lua/Lua.Build.cs @@ -422,7 +422,7 @@ private string GetBuildSystem() return "Ninja"; if (Target.Platform.IsInGroup(UnrealPlatformGroup.Windows)) { - if (Target.WindowsPlatform.Compiler == WindowsCompiler.VisualStudio2019) + if (Target.WindowsPlatform.Compiler == WindowsCompiler.Default) return "Visual Studio 16 2019"; #if UE_4_27_OR_LATER if (Target.WindowsPlatform.Compiler == WindowsCompiler.VisualStudio2022) diff --git a/Plugins/UnLua/Source/UnLua/Public/UnLuaEx.inl b/Plugins/UnLua/Source/UnLua/Public/UnLuaEx.inl index e6f81eda..a8b9b8a6 100644 --- a/Plugins/UnLua/Source/UnLua/Public/UnLuaEx.inl +++ b/Plugins/UnLua/Source/UnLua/Public/UnLuaEx.inl @@ -94,7 +94,7 @@ namespace UnLua { static void Generate(FString &Buffer, int32 Index) { - FString TypeName = TTypeIntelliSense::Value, typename TDecay::Type>::Type*, typename TDecay::Type>::Result>::GetName(); + FString TypeName = TTypeIntelliSense::Value, typename TDecay::Type>::Type*, typename TDecay::Type>::type>::GetName(); Buffer += FString::Printf(TEXT("---@param P%d %s %s\r\n"), Index, *TypeName, *TArgumentComment::Get()); TArgumentIntelliSense::Generate(Buffer, Index + 1); } @@ -123,7 +123,7 @@ namespace UnLua } // return - FString ReturnTypeName = TTypeIntelliSense::Value, typename TDecay::Type>::Type*, typename TDecay::Type>::Result>::GetName(); + FString ReturnTypeName = TTypeIntelliSense::Value, typename TDecay::Type>::Type*, typename TDecay::Type>::type>::GetName(); if (ReturnTypeName.Len() > 0) { Buffer += FString::Printf(TEXT("---@return %s\r\n"), *ReturnTypeName); @@ -876,7 +876,7 @@ namespace UnLua template void TExportedClassBase::GenerateIntelliSense(FString &Buffer) const { - GenerateIntelliSenseInternal(Buffer, typename TChooseClass::Result()); + GenerateIntelliSenseInternal(Buffer, typename std::conditional::type()); } template @@ -947,7 +947,7 @@ namespace UnLua TExportedClass::TExportedClass(const char *InName, const char *InSuperClassName) : FExportedClassBase(InName, InSuperClassName) { - AddDefaultFunctions(typename TChooseClass::Result()); + AddDefaultFunctions(typename std::conditional::type()); } template @@ -1025,14 +1025,14 @@ namespace UnLua template void TExportedClass::AddDefaultFunctions(FFalse NotReflected) { - AddConstructor(typename TChooseClass::Value, FTrue, FFalse>::Result()); - AddDestructor(typename TChooseClass, TNot>>::Value, FFalse, FTrue>::Result()); + AddConstructor(typename std::conditional::Value, FTrue, FFalse>::type()); + AddDestructor(typename std::conditional, TNot>>::Value, FFalse, FTrue>::type()); } template void TExportedClass::AddDefaultFunctions(FTrue Reflected) { - AddDefaultFunctions_Reflected(typename TChooseClass::Value, FTrue, FFalse>::Result()); + AddDefaultFunctions_Reflected(typename std::conditional::Value, FTrue, FFalse>::type()); } template @@ -1041,7 +1041,7 @@ namespace UnLua int32 NumArgs = sizeof...(CtorArgType); if (NumArgs > 0) { - AddConstructor(typename TChooseClass::Value, FTrue, FFalse>::Result()); + AddConstructor(typename std::conditional::Value, FTrue, FFalse>::type()); } } diff --git a/Plugins/UnLua/Source/UnLua/Public/UnLuaLegacy.h b/Plugins/UnLua/Source/UnLua/Public/UnLuaLegacy.h index 36dd6f60..f1179fcc 100644 --- a/Plugins/UnLua/Source/UnLua/Public/UnLuaLegacy.h +++ b/Plugins/UnLua/Source/UnLua/Public/UnLuaLegacy.h @@ -841,19 +841,19 @@ namespace UnLua virtual void Destruct(void* Dest) const override { static_assert(TIsDestructible::Value, "type must be destructible!"); - DestructInternal((T*)Dest, typename TChooseClass::Value, FTrue, FFalse>::Result()); + DestructInternal((T*)Dest, typename std::conditional::Value, FTrue, FFalse>::type()); } virtual void Copy(void* Dest, const void* Src) const override { static_assert(TIsCopyConstructible::Value, "type must be copy constructible!"); - CopyInternal((T*)Dest, (const T*)Src, typename TChooseClass::Value, FTrue, FFalse>::Result()); + CopyInternal((T*)Dest, (const T*)Src, typename std::conditional::Value, FTrue, FFalse>::type()); } virtual bool Identical(const void* A, const void* B) const override { static_assert(THasEqualityOperator::Value, "type must support operator==()!"); - return IdenticalInternal((const T*)A, (const T*)B, typename TChooseClass::Value, FTrue, FFalse>::Result()); + return IdenticalInternal((const T*)A, (const T*)B, typename std::conditional::Value, FTrue, FFalse>::type()); } virtual FString GetName() const override { return FString(TType::Type>::GetName()); } @@ -869,7 +869,7 @@ namespace UnLua { static_assert(TIsCopyConstructible::Value, "type must be copy constructible!"); T V = UnLua::Get(L, IndexInStack, TType()); - CopyInternal((T*)ContainerPtr, &V, typename TChooseClass::Value, FTrue, FFalse>::Result()); + CopyInternal((T*)ContainerPtr, &V, typename std::conditional::Value, FTrue, FFalse>::type()); } private: diff --git a/Plugins/UnLua/Source/UnLua/Public/UnLuaTemplate.h b/Plugins/UnLua/Source/UnLua/Public/UnLuaTemplate.h index 0c51b309..90898fab 100644 --- a/Plugins/UnLua/Source/UnLua/Public/UnLuaTemplate.h +++ b/Plugins/UnLua/Source/UnLua/Public/UnLuaTemplate.h @@ -80,7 +80,7 @@ namespace UnLua template struct TArgTypeTraits { typedef typename TDecay::Type RT; - typedef typename TChooseClass::Value, RT, typename TRemoveCV::Type>::Result Type; + typedef typename std::conditional::Value, RT, typename TRemoveCV::Type>::type Type; };