8000 5.4 update : TChoosClass is deprecated , use std::conditional instead by GShenLin · Pull Request #733 · Tencent/UnLua · GitHub
[go: up one dir, main page]
More Web Proxy on the site http://driver.im/
Skip to content

5.4 update : TChoosClass is deprecated , use std::conditional instead #733

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Open
wants to merge 1 commit into
base: dev/2.4
Choose a base branch
from
Open

5.4 update : TChoosClass is deprecated , use std::conditional instead #733

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
2 changes: 1 addition & 1 deletion Plugins/UnLua/Source/ThirdParty/Lua/Lua.Build.cs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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)
Expand Down
16 changes: 8 additions & 8 deletions Plugins/UnLua/Source/UnLua/Public/UnLuaEx.inl
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -94,7 +94,7 @@ namespace UnLua
{
static void Generate(FString &Buffer, int32 Index)
{
FString TypeName = TTypeIntelliSense<typename TChooseClass<TIsPointer<T1>::Value, typename TDecay<typename TRemovePointer<T1>::Type>::Type*, typename TDecay<T1>::Type>::Result>::GetName();
FString TypeName = TTypeIntelliSense<typename std::conditional<TIsPointer<T1>::Value, typename TDecay<typename TRemovePointer<T1>::Type>::Type*, typename TDecay<T1>::Type>::type>::GetName();
Buffer += FString::Printf(TEXT("---@param P%d %s %s\r\n"), Index, *TypeName, *TArgumentComment<T1>::Get());
TArgumentIntelliSense<T2...>::Generate(Buffer, Index + 1);
}
Expand Down Expand Up @@ -123,7 +123,7 @@ namespace UnLua
}

// return
FString ReturnTypeName = TTypeIntelliSense<typename TChooseClass<TIsPointer<RetType>::Value, typename TDecay<typename TRemovePointer<RetType>::Type>::Type*, typename TDecay<RetType>::Type>::Result>::GetName();
FString ReturnTypeName = TTypeIntelliSense<typename std::conditional<TIsPointer<RetType>::Value, typename TDecay<typename TRemovePointer<RetType>::Type>::Type*, typename TDecay<RetType>::Type>::type>::GetName();
if (ReturnTypeName.Len() > 0)
{
Buffer += FString::Printf(TEXT("---@return %s\r\n"), *ReturnTypeName);
Expand Down Expand Up @@ -876,7 +876,7 @@ namespace UnLua
template <bool bIsReflected>
void TExportedClassBase<bIsReflected>::GenerateIntelliSense(FString &Buffer) const
{
GenerateIntelliSenseInternal(Buffer, typename TChooseClass<bIsReflected, FTrue, FFalse>::Result());
GenerateIntelliSenseInternal(Buffer, typename std::conditional<bIsReflected, FTrue, FFalse>::type());
}

template <bool bIsReflected>
Expand Down Expand Up @@ -947,7 +947,7 @@ namespace UnLua
TExportedClass<bIsReflected, ClassType, CtorArgType...>::TExportedClass(const char *InName, const char *InSuperClassName)
: FExportedClassBase(InName, InSuperClassName)
{
AddDefaultFunctions(typename TChooseClass<bIsReflected, FTrue, FFalse>::Result());
AddDefaultFunctions(typename std::conditional<bIsReflected, FTrue, FFalse>::type());
}

template <bool bIsReflected, typename ClassType, typename... CtorArgType>
Expand Down Expand Up @@ -1025,14 +1025,14 @@ namespace UnLua
template <bool bIsReflected, typename ClassType, typename... CtorArgType>
void TExportedClass<bIsReflected, ClassType, CtorArgType...>::AddDefaultFunctions(FFalse NotReflected)
{
AddConstructor(typename TChooseClass<TIsConstructible<ClassType, CtorArgType...>::Value, FTrue, FFalse>::Result());
AddDestructor(typename TChooseClass<TAnd<TIsDestructible<ClassType>, TNot<TIsTriviallyDestructible<ClassType>>>::Value, FFalse, FTrue>::Result());
AddConstructor(typename std::conditional<TIsConstructible<ClassType, CtorArgType...>::Value, FTrue, FFalse>::type());
AddDestructor(typename std::conditional<TAnd<TIsDestructible<ClassType>, TNot<TIsTriviallyDestructible<ClassType>>>::Value, FFalse, FTrue>::type());
}

template <bool bIsReflected, typename ClassType, typename... CtorArgType>
void TExportedClass<bIsReflected, ClassType, CtorArgType...>::AddDefaultFunctions(FTrue Reflected)
{
AddDefaultFunctions_Reflected(typename TChooseClass<TPointerIsConvertibleFromTo<ClassType, UObject>::Value, FTrue, FFalse>::Result());
AddDefaultFunctions_Reflected(typename std::conditional<TPointerIsConvertibleFromTo<ClassType, UObject>::Value, FTrue, FFalse>::type());
}

template <bool bIsReflected, typename ClassType, typename... CtorArgType>
Expand All @@ -1041,7 +1041,7 @@ namespace UnLua
int32 NumArgs = sizeof...(CtorArgType);
if (NumArgs > 0)
{
AddConstructor(typename TChooseClass<TIsConstructible<ClassType, CtorArgType...>::Value, FTrue, FFalse>::Result());
AddConstructor(typename std::conditional<TIsConstructible<ClassType, CtorArgType...>::Value, FTrue, FFalse>::type());
}
}

Expand Down
8 changes: 4 additions & 4 deletions Plugins/UnLua/Source/UnLua/Public/UnLuaLegacy.h
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -841,19 +841,19 @@ namespace UnLua
virtual void Destruct(void* Dest) const override
{
static_assert(TIsDestructible<T>::Value, "type must be destructible!");
DestructInternal((T*)Dest, typename TChooseClass<TIsTriviallyDestructible<T>::Value, FTrue, FFalse>::Result());
DestructInternal((T*)Dest, typename std::conditional<TIsTriviallyDestructible<T>::Value, FTrue, FFalse>::type());
}

virtual void Copy(void* Dest, const void* Src) const override
{
static_assert(TIsCopyConstructible<T>::Value, "type must be copy constructible!");
CopyInternal((T*)Dest, (const T*)Src, typename TChooseClass<TIsTriviallyCopyConstructible<T>::Value, FTrue, FFalse>::Result());
CopyInternal((T*)Dest, (const T*)Src, typename std::conditional<TIsTriviallyCopyConstructible<T>::Value, FTrue, FFalse>::type());
}

virtual bool Identical(const void* A, const void* B) const override
{
static_assert(THasEqualityOperator<T>::Value, "type must support operator==()!");
return IdenticalInternal((const T*)A, (const T*)B, typename TChooseClass<THasEqualityOperator<T>::Value, FTrue, FFalse>::Result());
return IdenticalInternal((const T*)A, (const T*)B, typename std::conditional<THasEqualityOperator<T>::Value, FTrue, FFalse>::type());
}

virtual FString GetName() const override { return FString(TType<typename TDecay<T>::Type>::GetName()); }
Expand All @@ -869,7 +869,7 @@ namespace UnLua
{
static_assert(TIsCopyConstructible<T>::Value, "type must be copy constructible!");
T V = UnLua::Get(L, IndexInStack, TType<T>());
CopyInternal((T*)ContainerPtr, &V, typename TChooseClass<TIsTriviallyCopyConstructible<T>::Value, FTrue, FFalse>::Result());
CopyInternal((T*)ContainerPtr, &V, typename std::conditional<TIsTriviallyCopyConstructible<T>::Value, FTrue, FFalse>::type());
}

private:
Expand Down
2 changes: 1 addition & 1 deletion Plugins/UnLua/Source/UnLua/Public/UnLuaTemplate.h
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -80,7 +80,7 @@ namespace UnLua
template <typename T> struct TArgTypeTraits
{
typedef typename TDecay<T>::Type RT;
typedef typename TChooseClass<TIsPrimitiveTypeOrPointer<RT>::Value, RT, typename TRemoveCV<T>::Type>::Result Type;
typedef typename std::conditional<TIsPrimitiveTypeOrPointer<RT>::Value, RT, typename TRemoveCV<T>::Type>::type Type;
};


Expand Down
0