From 8baaa50335607c0bf491100b0f0946fe3e08173a Mon Sep 17 00:00:00 2001
From: _Redstone_c_ <myredstone1024@gmail.com>
Date: Sun, 26 Dec 2021 15:57:09 +0800
Subject: [PATCH] refactor(typetraits): remove TypeTraits namespace and bool
 operation template

---
 .../Private/Testing/TypeTraitsTesting.cpp     | 585 +++++++++---------
 .../Source/Public/TypeTraits/CompositeType.h  |   2 -
 .../Source/Public/TypeTraits/HelperClasses.h  |  23 -
 .../Source/Public/TypeTraits/Miscellaneous.h  |   2 -
 .../Source/Public/TypeTraits/PrimaryType.h    |   2 -
 .../Public/TypeTraits/SupportedOperations.h   |   2 -
 .../Source/Public/TypeTraits/TypeProperties.h |   4 +-
 7 files changed, 285 insertions(+), 335 deletions(-)

diff --git a/Redcraft.Utility/Source/Private/Testing/TypeTraitsTesting.cpp b/Redcraft.Utility/Source/Private/Testing/TypeTraitsTesting.cpp
index c14d9f2..afbbab1 100644
--- a/Redcraft.Utility/Source/Private/Testing/TypeTraitsTesting.cpp
+++ b/Redcraft.Utility/Source/Private/Testing/TypeTraitsTesting.cpp
@@ -47,400 +47,383 @@ void TestTypeTraits()
 {
 	// HelperClasses.h
 
-	always_check((TypeTraits::TConstant<int32, 1>::Value == 1));
-	always_check(static_cast<int32>(TypeTraits::TConstant<int32, 2>::Value) == 2);
-	always_check((TypeTraits::TConstant<int32, 3>() == 3));
+	always_check((TConstant<int32, 1>::Value == 1));
+	always_check(static_cast<int32>(TConstant<int32, 2>::Value) == 2);
+	always_check((TConstant<int32, 3>() == 3));
 
-	always_check(!TypeTraits::FFalse::Value);
-	always_check(TypeTraits::FTrue::Value);
-
-	always_check(TypeTraits::TAnd<TypeTraits::FTrue>::Value);
-	always_check(!TypeTraits::TAnd<TypeTraits::FFalse>::Value);
-	always_check((TypeTraits::TAnd<TypeTraits::FTrue, TypeTraits::FTrue>::Value));
-	always_check(!(TypeTraits::TAnd<TypeTraits::FFalse, TypeTraits::FTrue>::Value));
-	always_check(!(TypeTraits::TAnd<TypeTraits::FTrue, TypeTraits::FFalse>::Value));
-	always_check(!(TypeTraits::TAnd<TypeTraits::FFalse, TypeTraits::FFalse>::Value));
-
-	always_check(TypeTraits::TOr<TypeTraits::FTrue>::Value);
-	always_check(!TypeTraits::TOr<TypeTraits::FFalse>::Value);
-	always_check((TypeTraits::TOr<TypeTraits::FTrue, TypeTraits::FTrue>::Value));
-	always_check((TypeTraits::TOr<TypeTraits::FFalse, TypeTraits::FTrue>::Value));
-	always_check((TypeTraits::TOr<TypeTraits::FTrue, TypeTraits::FFalse>::Value));
-	always_check(!(TypeTraits::TOr<TypeTraits::FFalse, TypeTraits::FFalse>::Value));
-
-	always_check(!TypeTraits::TNot<TypeTraits::FTrue>::Value);
-	always_check(TypeTraits::TNot<TypeTraits::FFalse>::Value);
+	always_check(!FFalse::Value);
+	always_check(FTrue::Value);
 
 	// PrimaryType.h
 
-	always_check(!TypeTraits::TIsVoid<int32>::Value);
-	always_check(TypeTraits::TIsVoid<void>::Value);
-	always_check(TypeTraits::TIsVoid<const void>::Value);
-	always_check(TypeTraits::TIsVoid<const volatile void>::Value);
-	always_check(TypeTraits::TIsVoid<volatile void>::Value);
+	always_check(!TIsVoid<int32>::Value);
+	always_check(TIsVoid<void>::Value);
+	always_check(TIsVoid<const void>::Value);
+	always_check(TIsVoid<const volatile void>::Value);
+	always_check(TIsVoid<volatile void>::Value);
 
-	always_check(!TypeTraits::TIsNullPointer<int32>::Value);
-	always_check(TypeTraits::TIsNullPointer<nullptr_t>::Value);
+	always_check(!TIsNullPointer<int32>::Value);
+	always_check(TIsNullPointer<nullptr_t>::Value);
 
-	always_check(TypeTraits::TIsIntegral<int32>::Value);
-	always_check(!TypeTraits::TIsIntegral<float>::Value);
+	always_check(TIsIntegral<int32>::Value);
+	always_check(!TIsIntegral<float>::Value);
 
-	always_check(!TypeTraits::TIsFloatingPoint<int32>::Value);
-	always_check(TypeTraits::TIsFloatingPoint<float>::Value);
+	always_check(!TIsFloatingPoint<int32>::Value);
+	always_check(TIsFloatingPoint<float>::Value);
 
-	always_check(!TypeTraits::TIsArray<int32>::Value);
-	always_check(TypeTraits::TIsArray<int32[]>::Value);
-	always_check(TypeTraits::TIsArray<int32[10]>::Value);
+	always_check(!TIsArray<int32>::Value);
+	always_check(TIsArray<int32[]>::Value);
+	always_check(TIsArray<int32[10]>::Value);
 
-	always_check(!TypeTraits::TIsPointer<int32>::Value);
-	always_check(TypeTraits::TIsPointer<int32*>::Value);
+	always_check(!TIsPointer<int32>::Value);
+	always_check(TIsPointer<int32*>::Value);
 
-	always_check(!TypeTraits::TIsLValueReference<int32>::Value);
-	always_check(TypeTraits::TIsLValueReference<int32&>::Value);
-	always_check(!TypeTraits::TIsLValueReference<int32&&>::Value);
+	always_check(!TIsLValueReference<int32>::Value);
+	always_check(TIsLValueReference<int32&>::Value);
+	always_check(!TIsLValueReference<int32&&>::Value);
 	
-	always_check(!TypeTraits::TIsRValueReference<int32>::Value);
-	always_check(!TypeTraits::TIsRValueReference<int32&>::Value);
-	always_check(TypeTraits::TIsRValueReference<int32&&>::Value);
+	always_check(!TIsRValueReference<int32>::Value);
+	always_check(!TIsRValueReference<int32&>::Value);
+	always_check(TIsRValueReference<int32&&>::Value);
 
-	always_check(TypeTraits::TIsMemberObjectPointer<int32(FTestStructA::*)>::Value);
-	always_check(!TypeTraits::TIsMemberObjectPointer<int32(FTestStructA::*)()>::Value);
+	always_check(TIsMemberObjectPointer<int32(FTestStructA::*)>::Value);
+	always_check(!TIsMemberObjectPointer<int32(FTestStructA::*)()>::Value);
 
-	always_check(!TypeTraits::TIsMemberFunctionPointer<int32(FTestStructA::*)>::Value);
-	always_check(TypeTraits::TIsMemberFunctionPointer<int32(FTestStructA::*)()>::Value);
+	always_check(!TIsMemberFunctionPointer<int32(FTestStructA::*)>::Value);
+	always_check(TIsMemberFunctionPointer<int32(FTestStructA::*)()>::Value);
 
-	always_check(!TypeTraits::TIsEnum<int32>::Value);
-	always_check(!TypeTraits::TIsEnum<FTestStructA>::Value);
-	always_check(TypeTraits::TIsEnum<ETestEnum>::Value);
-	always_check(TypeTraits::TIsEnum<ETestEnumClass>::Value);
+	always_check(!TIsEnum<int32>::Value);
+	always_check(!TIsEnum<FTestStructA>::Value);
+	always_check(TIsEnum<ETestEnum>::Value);
+	always_check(TIsEnum<ETestEnumClass>::Value);
 
-	always_check(!TypeTraits::TIsUnion<int32>::Value);
-	always_check(!TypeTraits::TIsUnion<FTestStructA>::Value);
-	always_check(TypeTraits::TIsUnion<FTestUnion>::Value);
+	always_check(!TIsUnion<int32>::Value);
+	always_check(!TIsUnion<FTestStructA>::Value);
+	always_check(TIsUnion<FTestUnion>::Value);
 
-	always_check(!TypeTraits::TIsUnion<int32>::Value);
-	always_check(!TypeTraits::TIsUnion<FTestStructA>::Value);
-	always_check(TypeTraits::TIsUnion<FTestUnion>::Value);
+	always_check(!TIsUnion<int32>::Value);
+	always_check(!TIsUnion<FTestStructA>::Value);
+	always_check(TIsUnion<FTestUnion>::Value);
 
-	always_check(!TypeTraits::TIsFunction<int32>::Value);
-	always_check(!TypeTraits::TIsFunction<FTestStructA>::Value);
-	always_check(!TypeTraits::TIsFunction<FTestUnion>::Value);
-	always_check(TypeTraits::TIsFunction<int32(int32)>::Value);
+	always_check(!TIsFunction<int32>::Value);
+	always_check(!TIsFunction<FTestStructA>::Value);
+	always_check(!TIsFunction<FTestUnion>::Value);
+	always_check(TIsFunction<int32(int32)>::Value);
 
 	// CompositeType.h
 
-	always_check(!TypeTraits::TIsFundamental<FTestStructA>::Value);
-	always_check(TypeTraits::TIsFundamental<int32>::Value);
-	always_check(TypeTraits::TIsFundamental<float>::Value);
-	always_check(!TypeTraits::TIsFundamental<int32*>::Value);
-	always_check(TypeTraits::TIsFundamental<void>::Value);
+	always_check(!TIsFundamental<FTestStructA>::Value);
+	always_check(TIsFundamental<int32>::Value);
+	always_check(TIsFundamental<float>::Value);
+	always_check(!TIsFundamental<int32*>::Value);
+	always_check(TIsFundamental<void>::Value);
 
-	always_check(!TypeTraits::TIsArithmetic<FTestStructA>::Value);
-	always_check(TypeTraits::TIsArithmetic<int32>::Value);
-	always_check(TypeTraits::TIsArithmetic<float>::Value);
-	always_check(!TypeTraits::TIsArithmetic<int32*>::Value);
-	always_check(!TypeTraits::TIsArithmetic<void>::Value);
+	always_check(!TIsArithmetic<FTestStructA>::Value);
+	always_check(TIsArithmetic<int32>::Value);
+	always_check(TIsArithmetic<float>::Value);
+	always_check(!TIsArithmetic<int32*>::Value);
+	always_check(!TIsArithmetic<void>::Value);
 
-	always_check(!TypeTraits::TIsScalar<FTestStructA>::Value);
-	always_check(TypeTraits::TIsScalar<int32>::Value);
-	always_check(TypeTraits::TIsScalar<float>::Value);
-	always_check(TypeTraits::TIsScalar<int32*>::Value);
-	always_check(!TypeTraits::TIsScalar<void>::Value);
+	always_check(!TIsScalar<FTestStructA>::Value);
+	always_check(TIsScalar<int32>::Value);
+	always_check(TIsScalar<float>::Value);
+	always_check(TIsScalar<int32*>::Value);
+	always_check(!TIsScalar<void>::Value);
 
-	always_check(TypeTraits::TIsObject<FTestStructA>::Value);
-	always_check(!TypeTraits::TIsObject<FTestStructA&>::Value);
-	always_check(TypeTraits::TIsObject<int32>::Value);
-	always_check(TypeTraits::TIsObject<int32*>::Value);
-	always_check(!TypeTraits::TIsObject<int32&>::Value);
+	always_check(TIsObject<FTestStructA>::Value);
+	always_check(!TIsObject<FTestStructA&>::Value);
+	always_check(TIsObject<int32>::Value);
+	always_check(TIsObject<int32*>::Value);
+	always_check(!TIsObject<int32&>::Value);
 
-	always_check(TypeTraits::TIsCompound<FTestStructA>::Value);
-	always_check(TypeTraits::TIsCompound<FTestStructA&>::Value);
-	always_check(!TypeTraits::TIsCompound<int32>::Value);
-	always_check(TypeTraits::TIsCompound<int32*>::Value);
-	always_check(TypeTraits::TIsCompound<int32&>::Value);
+	always_check(TIsCompound<FTestStructA>::Value);
+	always_check(TIsCompound<FTestStructA&>::Value);
+	always_check(!TIsCompound<int32>::Value);
+	always_check(TIsCompound<int32*>::Value);
+	always_check(TIsCompound<int32&>::Value);
 
-	always_check(!TypeTraits::TIsReference<int32>::Value);
-	always_check(!TypeTraits::TIsReference<int32*>::Value);
-	always_check(TypeTraits::TIsReference<int32&>::Value);
-	always_check(TypeTraits::TIsReference<int32&&>::Value);
+	always_check(!TIsReference<int32>::Value);
+	always_check(!TIsReference<int32*>::Value);
+	always_check(TIsReference<int32&>::Value);
+	always_check(TIsReference<int32&&>::Value);
 
-	always_check(!TypeTraits::TIsMemberPointer<FTestStructA>::Value);
-	always_check(TypeTraits::TIsMemberPointer<int32(FTestStructA::*)>::Value);
+	always_check(!TIsMemberPointer<FTestStructA>::Value);
+	always_check(TIsMemberPointer<int32(FTestStructA::*)>::Value);
 
 	// TypeProperties.h
 
-	always_check(!TypeTraits::TIsConst<int32>::Value);
-	always_check(TypeTraits::TIsConst<const int32>::Value);
-	always_check(!TypeTraits::TIsConst<volatile int32>::Value);
-	always_check(TypeTraits::TIsConst<const volatile int32>::Value);
+	always_check(!TIsConst<int32>::Value);
+	always_check(TIsConst<const int32>::Value);
+	always_check(!TIsConst<volatile int32>::Value);
+	always_check(TIsConst<const volatile int32>::Value);
 
-	always_check(!TypeTraits::TIsVolatile<int32>::Value);
-	always_check(!TypeTraits::TIsVolatile<const int32>::Value);
-	always_check(TypeTraits::TIsVolatile<volatile int32>::Value);
-	always_check(TypeTraits::TIsVolatile<const volatile int32>::Value);
+	always_check(!TIsVolatile<int32>::Value);
+	always_check(!TIsVolatile<const int32>::Value);
+	always_check(TIsVolatile<volatile int32>::Value);
+	always_check(TIsVolatile<const volatile int32>::Value);
 
-	always_check(TypeTraits::TIsTrivial<FTestStructB>::Value);
-	always_check(!TypeTraits::TIsTrivial<FTestStructC>::Value);
+	always_check(TIsTrivial<FTestStructB>::Value);
+	always_check(!TIsTrivial<FTestStructC>::Value);
 
-	always_check(TypeTraits::TIsTriviallyCopyable<FTestStructB>::Value);
-	always_check(!TypeTraits::TIsTriviallyCopyable<FTestStructD>::Value);
-	always_check(!TypeTraits::TIsTriviallyCopyable<FTestStructE>::Value);
+	always_check(TIsTriviallyCopyable<FTestStructB>::Value);
+	always_check(!TIsTriviallyCopyable<FTestStructD>::Value);
+	always_check(!TIsTriviallyCopyable<FTestStructE>::Value);
 
-	always_check(TypeTraits::TIsStandardLayout<FTestStructB>::Value);
-	always_check(!TypeTraits::TIsStandardLayout<FTestStructE>::Value);
-	always_check(!TypeTraits::TIsStandardLayout<FTestStructF>::Value);
+	always_check(TIsStandardLayout<FTestStructB>::Value);
+	always_check(!TIsStandardLayout<FTestStructE>::Value);
+	always_check(!TIsStandardLayout<FTestStructF>::Value);
 
-	always_check(TypeTraits::THasUniqueObjectRepresentations<FTestStructF>::Value);
-	always_check(!TypeTraits::THasUniqueObjectRepresentations<FTestStructG>::Value);
+	always_check(THasUniqueObjectRepresentations<FTestStructF>::Value);
+	always_check(!THasUniqueObjectRepresentations<FTestStructG>::Value);
 
-	always_check(TypeTraits::TIsEmpty<FTestStructA>::Value);
-	always_check(!TypeTraits::TIsEmpty<FTestStructB>::Value);
-	always_check(TypeTraits::TIsEmpty<FTestStructC>::Value);
-	always_check(TypeTraits::TIsEmpty<FTestStructD>::Value);
-	always_check(!TypeTraits::TIsEmpty<FTestStructE>::Value);
-	always_check(!TypeTraits::TIsEmpty<FTestStructF>::Value);
+	always_check(TIsEmpty<FTestStructA>::Value);
+	always_check(!TIsEmpty<FTestStructB>::Value);
+	always_check(TIsEmpty<FTestStructC>::Value);
+	always_check(TIsEmpty<FTestStructD>::Value);
+	always_check(!TIsEmpty<FTestStructE>::Value);
+	always_check(!TIsEmpty<FTestStructF>::Value);
 
-	always_check(TypeTraits::TIsPolymorphic<FTestStructE>::Value);
-	always_check(!TypeTraits::TIsPolymorphic<FTestStructF>::Value);
+	always_check(TIsPolymorphic<FTestStructE>::Value);
+	always_check(!TIsPolymorphic<FTestStructF>::Value);
 
-	always_check(TypeTraits::TIsAbstract<FTestStructE>::Value);
-	always_check(!TypeTraits::TIsAbstract<FTestStructH>::Value);
+	always_check(TIsAbstract<FTestStructE>::Value);
+	always_check(!TIsAbstract<FTestStructH>::Value);
 
-	always_check(!TypeTraits::TIsFinal<FTestStructE>::Value);
-	always_check(TypeTraits::TIsFinal<FTestStructH>::Value);
+	always_check(!TIsFinal<FTestStructE>::Value);
+	always_check(TIsFinal<FTestStructH>::Value);
 
-	always_check(!TypeTraits::TIsAggregate<int32>::Value);
-	always_check(TypeTraits::TIsAggregate<int32[64]>::Value);
-	always_check(TypeTraits::TIsAggregate<FTestStructB>::Value);
-	always_check(!TypeTraits::TIsAggregate<FTestStructF>::Value);
+	always_check(!TIsAggregate<int32>::Value);
+	always_check(TIsAggregate<int32[64]>::Value);
+	always_check(TIsAggregate<FTestStructB>::Value);
+	always_check(!TIsAggregate<FTestStructF>::Value);
 
-	always_check(TypeTraits::TIsSigned<signed>::Value);
-	always_check(!TypeTraits::TIsSigned<unsigned>::Value);
+	always_check(TIsSigned<signed>::Value);
+	always_check(!TIsSigned<unsigned>::Value);
 
-	always_check(!TypeTraits::TIsUnsigned<signed>::Value);
-	always_check(TypeTraits::TIsUnsigned<unsigned>::Value);
+	always_check(!TIsUnsigned<signed>::Value);
+	always_check(TIsUnsigned<unsigned>::Value);
 
-	always_check(!TypeTraits::TIsBoundedArray<int32>::Value);
-	always_check(!TypeTraits::TIsBoundedArray<int32[]>::Value);
-	always_check(TypeTraits::TIsBoundedArray<int32[64]>::Value);
+	always_check(!TIsBoundedArray<int32>::Value);
+	always_check(!TIsBoundedArray<int32[]>::Value);
+	always_check(TIsBoundedArray<int32[64]>::Value);
 
-	always_check(!TypeTraits::TIsUnboundedArray<int32>::Value);
-	always_check(TypeTraits::TIsUnboundedArray<int32[]>::Value);
-	always_check(!TypeTraits::TIsUnboundedArray<int32[64]>::Value);
+	always_check(!TIsUnboundedArray<int32>::Value);
+	always_check(TIsUnboundedArray<int32[]>::Value);
+	always_check(!TIsUnboundedArray<int32[64]>::Value);
 
-	always_check(!TypeTraits::TIsScopedEnum<ETestEnum>::Value);
-	always_check(TypeTraits::TIsScopedEnum<ETestEnumClass>::Value);
+	always_check(!TIsScopedEnum<ETestEnum>::Value);
+	always_check(TIsScopedEnum<ETestEnumClass>::Value);
 
 	// SupportedOperations.h
 
-	always_check(!TypeTraits::TIsDefaultConstructible<FTestStructI>::Value);
-	always_check(TypeTraits::TIsDefaultConstructible<FTestStructJ>::Value);
-	always_check(TypeTraits::TIsDefaultConstructible<FTestStructK>::Value);
-	always_check(!TypeTraits::TIsDefaultConstructible<FTestStructL>::Value);
+	always_check(!TIsDefaultConstructible<FTestStructI>::Value);
+	always_check(TIsDefaultConstructible<FTestStructJ>::Value);
+	always_check(TIsDefaultConstructible<FTestStructK>::Value);
+	always_check(!TIsDefaultConstructible<FTestStructL>::Value);
 
-	always_check(!TypeTraits::TIsTriviallyDefaultConstructible<FTestStructI>::Value);
-	always_check(!TypeTraits::TIsTriviallyDefaultConstructible<FTestStructJ>::Value);
-	always_check(TypeTraits::TIsTriviallyDefaultConstructible<FTestStructK>::Value);
-	always_check(!TypeTraits::TIsTriviallyDefaultConstructible<FTestStructL>::Value);
+	always_check(!TIsTriviallyDefaultConstructible<FTestStructI>::Value);
+	always_check(!TIsTriviallyDefaultConstructible<FTestStructJ>::Value);
+	always_check(TIsTriviallyDefaultConstructible<FTestStructK>::Value);
+	always_check(!TIsTriviallyDefaultConstructible<FTestStructL>::Value);
 
-	always_check(!(TypeTraits::TIsConstructible<FTestStructI, int32>::Value));
-	always_check((TypeTraits::TIsConstructible<FTestStructI, FTestStructI&>::Value));
-	always_check((TypeTraits::TIsConstructible<FTestStructI, int32, double>::Value));
+	always_check(!(TIsConstructible<FTestStructI, int32>::Value));
+	always_check((TIsConstructible<FTestStructI, FTestStructI&>::Value));
+	always_check((TIsConstructible<FTestStructI, int32, double>::Value));
 
-	always_check(!(TypeTraits::TIsTriviallyConstructible<FTestStructI, int32>::Value));
-	always_check((TypeTraits::TIsTriviallyConstructible<FTestStructI, FTestStructI&>::Value));
-	always_check(!(TypeTraits::TIsTriviallyConstructible<FTestStructI, int32, double>::Value));
+	always_check(!(TIsTriviallyConstructible<FTestStructI, int32>::Value));
+	always_check((TIsTriviallyConstructible<FTestStructI, FTestStructI&>::Value));
+	always_check(!(TIsTriviallyConstructible<FTestStructI, int32, double>::Value));
 
-	always_check(TypeTraits::TIsCopyConstructible<FTestStructM>::Value);
-	always_check(TypeTraits::TIsCopyConstructible<FTestStructN>::Value);
-	always_check(!TypeTraits::TIsCopyConstructible<FTestStructO>::Value);
+	always_check(TIsCopyConstructible<FTestStructM>::Value);
+	always_check(TIsCopyConstructible<FTestStructN>::Value);
+	always_check(!TIsCopyConstructible<FTestStructO>::Value);
 
-	always_check(!TypeTraits::TIsTriviallyCopyConstructible<FTestStructM>::Value);
-	always_check(TypeTraits::TIsTriviallyCopyConstructible<FTestStructN>::Value);
-	always_check(!TypeTraits::TIsTriviallyCopyConstructible<FTestStructO>::Value);
+	always_check(!TIsTriviallyCopyConstructible<FTestStructM>::Value);
+	always_check(TIsTriviallyCopyConstructible<FTestStructN>::Value);
+	always_check(!TIsTriviallyCopyConstructible<FTestStructO>::Value);
 
-	always_check(TypeTraits::TIsMoveConstructible<FTestStructP>::Value);
-	always_check(TypeTraits::TIsMoveConstructible<FTestStructQ>::Value);
-	always_check(!TypeTraits::TIsMoveConstructible<FTestStructR>::Value);
+	always_check(TIsMoveConstructible<FTestStructP>::Value);
+	always_check(TIsMoveConstructible<FTestStructQ>::Value);
+	always_check(!TIsMoveConstructible<FTestStructR>::Value);
 
-	always_check(!TypeTraits::TIsTriviallyMoveConstructible<FTestStructP>::Value);
-	always_check(TypeTraits::TIsTriviallyMoveConstructible<FTestStructQ>::Value);
-	always_check(!TypeTraits::TIsTriviallyMoveConstructible<FTestStructR>::Value);
+	always_check(!TIsTriviallyMoveConstructible<FTestStructP>::Value);
+	always_check(TIsTriviallyMoveConstructible<FTestStructQ>::Value);
+	always_check(!TIsTriviallyMoveConstructible<FTestStructR>::Value);
 
-	always_check(!(TypeTraits::TIsAssignable<FTestStructI, FTestStructH>::Value));
-	always_check((TypeTraits::TIsAssignable<FTestStructI, FTestStructI&>::Value));
-	always_check((TypeTraits::TIsAssignable<FTestStructI, int32>::Value));
+	always_check(!(TIsAssignable<FTestStructI, FTestStructH>::Value));
+	always_check((TIsAssignable<FTestStructI, FTestStructI&>::Value));
+	always_check((TIsAssignable<FTestStructI, int32>::Value));
 
-	always_check(!(TypeTraits::TIsTriviallyAssignable<FTestStructI, FTestStructH>::Value));
-	always_check((TypeTraits::TIsTriviallyAssignable<FTestStructI, FTestStructI&>::Value));
-	always_check(!(TypeTraits::TIsTriviallyAssignable<FTestStructI, int32>::Value));
+	always_check(!(TIsTriviallyAssignable<FTestStructI, FTestStructH>::Value));
+	always_check((TIsTriviallyAssignable<FTestStructI, FTestStructI&>::Value));
+	always_check(!(TIsTriviallyAssignable<FTestStructI, int32>::Value));
 
-	always_check(TypeTraits::TIsCopyAssignable<FTestStructM>::Value);
-	always_check(TypeTraits::TIsCopyAssignable<FTestStructN>::Value);
-	always_check(!TypeTraits::TIsCopyAssignable<FTestStructO>::Value);
+	always_check(TIsCopyAssignable<FTestStructM>::Value);
+	always_check(TIsCopyAssignable<FTestStructN>::Value);
+	always_check(!TIsCopyAssignable<FTestStructO>::Value);
 
-	always_check(!TypeTraits::TIsTriviallyCopyAssignable<FTestStructM>::Value);
-	always_check(TypeTraits::TIsTriviallyCopyAssignable<FTestStructN>::Value);
-	always_check(!TypeTraits::TIsTriviallyCopyAssignable<FTestStructO>::Value);
+	always_check(!TIsTriviallyCopyAssignable<FTestStructM>::Value);
+	always_check(TIsTriviallyCopyAssignable<FTestStructN>::Value);
+	always_check(!TIsTriviallyCopyAssignable<FTestStructO>::Value);
 
-	always_check(TypeTraits::TIsMoveAssignable<FTestStructP>::Value);
-	always_check(TypeTraits::TIsMoveAssignable<FTestStructQ>::Value);
-	always_check(!TypeTraits::TIsMoveAssignable<FTestStructR>::Value);
+	always_check(TIsMoveAssignable<FTestStructP>::Value);
+	always_check(TIsMoveAssignable<FTestStructQ>::Value);
+	always_check(!TIsMoveAssignable<FTestStructR>::Value);
 
-	always_check(!TypeTraits::TIsTriviallyMoveAssignable<FTestStructP>::Value);
-	always_check(TypeTraits::TIsTriviallyMoveAssignable<FTestStructQ>::Value);
-	always_check(!TypeTraits::TIsTriviallyMoveAssignable<FTestStructR>::Value);
+	always_check(!TIsTriviallyMoveAssignable<FTestStructP>::Value);
+	always_check(TIsTriviallyMoveAssignable<FTestStructQ>::Value);
+	always_check(!TIsTriviallyMoveAssignable<FTestStructR>::Value);
 
-	always_check(TypeTraits::TIsDestructible<FTestStructS>::Value);
-	always_check(TypeTraits::TIsDestructible<FTestStructT>::Value);
-	always_check(!TypeTraits::TIsDestructible<FTestStructU>::Value);
+	always_check(TIsDestructible<FTestStructS>::Value);
+	always_check(TIsDestructible<FTestStructT>::Value);
+	always_check(!TIsDestructible<FTestStructU>::Value);
 
-	always_check(!TypeTraits::TIsTriviallyDestructible<FTestStructS>::Value);
-	always_check(TypeTraits::TIsTriviallyDestructible<FTestStructT>::Value);
-	always_check(!TypeTraits::TIsTriviallyDestructible<FTestStructU>::Value);
+	always_check(!TIsTriviallyDestructible<FTestStructS>::Value);
+	always_check(TIsTriviallyDestructible<FTestStructT>::Value);
+	always_check(!TIsTriviallyDestructible<FTestStructU>::Value);
 
-	always_check(!TypeTraits::THasVirtualDestructor<FTestStructT>::Value);
-	always_check(TypeTraits::THasVirtualDestructor<FTestStructV>::Value);
+	always_check(!THasVirtualDestructor<FTestStructT>::Value);
+	always_check(THasVirtualDestructor<FTestStructV>::Value);
 
 	// Miscellaneous.h
 
-	always_check(TypeTraits::TRank<int32[1][2][3]>::Value == 3);
-	always_check(TypeTraits::TRank<int32[1][2][3][4]>::Value == 4);
-	always_check(TypeTraits::TRank<int32>::Value == 0);
+	always_check(TRank<int32[1][2][3]>::Value == 3);
+	always_check(TRank<int32[1][2][3][4]>::Value == 4);
+	always_check(TRank<int32>::Value == 0);
 
-	always_check(TypeTraits::TExtent<int32[1][2][3]>::Value == 1);
-	always_check((TypeTraits::TExtent<int32[1][2][3][4], 1>::Value == 2));
-	always_check(TypeTraits::TExtent<int32[]>::Value == 0);
+	always_check(TExtent<int32[1][2][3]>::Value == 1);
+	always_check((TExtent<int32[1][2][3][4], 1>::Value == 2));
+	always_check(TExtent<int32[]>::Value == 0);
 
-	always_check(!(TypeTraits::TIsSame<int32, int64>::Value));
-	always_check((TypeTraits::TIsSame<int32, int32>::Value));
+	always_check(!(TIsSame<int32, int64>::Value));
+	always_check((TIsSame<int32, int32>::Value));
 
-	always_check(!(TypeTraits::TIsBaseOf<FTestStructH, FTestStructD>::Value));
-	always_check(!(TypeTraits::TIsBaseOf<FTestStructH, FTestStructE>::Value));
-	always_check((TypeTraits::TIsBaseOf<FTestStructE, FTestStructH>::Value));
+	always_check(!(TIsBaseOf<FTestStructH, FTestStructD>::Value));
+	always_check(!(TIsBaseOf<FTestStructH, FTestStructE>::Value));
+	always_check((TIsBaseOf<FTestStructE, FTestStructH>::Value));
 
-	always_check((TypeTraits::TIsConvertible<int32, uint32>::Value));
-	always_check(!(TypeTraits::TIsConvertible<FTestStructH*, FTestStructD*>::Value));
-	always_check((TypeTraits::TIsConvertible<FTestStructH*, FTestStructE*>::Value));
-	always_check(!(TypeTraits::TIsConvertible<FTestStructE*, FTestStructH*>::Value));
-	always_check((TypeTraits::TIsConvertible<FTestStructW, FTestStructV>::Value));
+	always_check((TIsConvertible<int32, uint32>::Value));
+	always_check(!(TIsConvertible<FTestStructH*, FTestStructD*>::Value));
+	always_check((TIsConvertible<FTestStructH*, FTestStructE*>::Value));
+	always_check(!(TIsConvertible<FTestStructE*, FTestStructH*>::Value));
+	always_check((TIsConvertible<FTestStructW, FTestStructV>::Value));
 
-	always_check((TypeTraits::TIsInvocable<void, int32()>::Value));
-	always_check((TypeTraits::TIsInvocable<int32, int32()>::Value));
-	always_check((TypeTraits::TIsInvocable<int32, int32(int32), int32>::Value));
-	always_check(!(TypeTraits::TIsInvocable<int32, int32(int32), FTestStructA>::Value));
-	always_check(!(TypeTraits::TIsInvocable<FTestStructA, int32(int32), int32>::Value));
+	always_check((TIsInvocable<void, int32()>::Value));
+	always_check((TIsInvocable<int32, int32()>::Value));
+	always_check((TIsInvocable<int32, int32(int32), int32>::Value));
+	always_check(!(TIsInvocable<int32, int32(int32), FTestStructA>::Value));
+	always_check(!(TIsInvocable<FTestStructA, int32(int32), int32>::Value));
 
-	always_check((TypeTraits::TIsSame<int32, TypeTraits::TRemoveConst<int32>::Type>::Value));
-	always_check(!(TypeTraits::TIsSame<int32, TypeTraits::TRemoveConst<int32*>::Type>::Value));
-	always_check(!(TypeTraits::TIsSame<int32, TypeTraits::TRemoveConst<int32&>::Type>::Value));
-	always_check(!(TypeTraits::TIsSame<int32, TypeTraits::TRemoveConst<int32&&>::Type>::Value));
-	always_check((TypeTraits::TIsSame<int32, TypeTraits::TRemoveConst<const int32>::Type>::Value));
-	always_check(!(TypeTraits::TIsSame<int32, TypeTraits::TRemoveConst<volatile int32>::Type>::Value));
-	always_check(!(TypeTraits::TIsSame<int32, TypeTraits::TRemoveConst<const volatile int32>::Type>::Value));
-	always_check(!(TypeTraits::TIsSame<int32, TypeTraits::TRemoveConst<const volatile int32&>::Type>::Value));
+	always_check((TIsSame<int32, TRemoveConst<int32>::Type>::Value));
+	always_check(!(TIsSame<int32, TRemoveConst<int32*>::Type>::Value));
+	always_check(!(TIsSame<int32, TRemoveConst<int32&>::Type>::Value));
+	always_check(!(TIsSame<int32, TRemoveConst<int32&&>::Type>::Value));
+	always_check((TIsSame<int32, TRemoveConst<const int32>::Type>::Value));
+	always_check(!(TIsSame<int32, TRemoveConst<volatile int32>::Type>::Value));
+	always_check(!(TIsSame<int32, TRemoveConst<const volatile int32>::Type>::Value));
+	always_check(!(TIsSame<int32, TRemoveConst<const volatile int32&>::Type>::Value));
 
-	always_check((TypeTraits::TIsSame<int32, TypeTraits::TRemoveVolatile<int32>::Type>::Value));
-	always_check(!(TypeTraits::TIsSame<int32, TypeTraits::TRemoveVolatile<int32*>::Type>::Value));
-	always_check(!(TypeTraits::TIsSame<int32, TypeTraits::TRemoveVolatile<int32&>::Type>::Value));
-	always_check(!(TypeTraits::TIsSame<int32, TypeTraits::TRemoveVolatile<int32&&>::Type>::Value));
-	always_check(!(TypeTraits::TIsSame<int32, TypeTraits::TRemoveVolatile<const int32>::Type>::Value));
-	always_check((TypeTraits::TIsSame<int32, TypeTraits::TRemoveVolatile<volatile int32>::Type>::Value));
-	always_check(!(TypeTraits::TIsSame<int32, TypeTraits::TRemoveVolatile<const volatile int32>::Type>::Value));
-	always_check(!(TypeTraits::TIsSame<int32, TypeTraits::TRemoveVolatile<const volatile int32&>::Type>::Value));
+	always_check((TIsSame<int32, TRemoveVolatile<int32>::Type>::Value));
+	always_check(!(TIsSame<int32, TRemoveVolatile<int32*>::Type>::Value));
+	always_check(!(TIsSame<int32, TRemoveVolatile<int32&>::Type>::Value));
+	always_check(!(TIsSame<int32, TRemoveVolatile<int32&&>::Type>::Value));
+	always_check(!(TIsSame<int32, TRemoveVolatile<const int32>::Type>::Value));
+	always_check((TIsSame<int32, TRemoveVolatile<volatile int32>::Type>::Value));
+	always_check(!(TIsSame<int32, TRemoveVolatile<const volatile int32>::Type>::Value));
+	always_check(!(TIsSame<int32, TRemoveVolatile<const volatile int32&>::Type>::Value));
 
-	always_check((TypeTraits::TIsSame<int32, TypeTraits::TRemoveCV<int32>::Type>::Value));
-	always_check(!(TypeTraits::TIsSame<int32, TypeTraits::TRemoveCV<int32*>::Type>::Value));
-	always_check(!(TypeTraits::TIsSame<int32, TypeTraits::TRemoveCV<int32&>::Type>::Value));
-	always_check(!(TypeTraits::TIsSame<int32, TypeTraits::TRemoveCV<int32&&>::Type>::Value));
-	always_check((TypeTraits::TIsSame<int32, TypeTraits::TRemoveCV<const int32>::Type>::Value));
-	always_check((TypeTraits::TIsSame<int32, TypeTraits::TRemoveCV<volatile int32>::Type>::Value));
-	always_check((TypeTraits::TIsSame<int32, TypeTraits::TRemoveCV<const volatile int32>::Type>::Value));
-	always_check(!(TypeTraits::TIsSame<int32, TypeTraits::TRemoveCV<const volatile int32&>::Type>::Value));
+	always_check((TIsSame<int32, TRemoveCV<int32>::Type>::Value));
+	always_check(!(TIsSame<int32, TRemoveCV<int32*>::Type>::Value));
+	always_check(!(TIsSame<int32, TRemoveCV<int32&>::Type>::Value));
+	always_check(!(TIsSame<int32, TRemoveCV<int32&&>::Type>::Value));
+	always_check((TIsSame<int32, TRemoveCV<const int32>::Type>::Value));
+	always_check((TIsSame<int32, TRemoveCV<volatile int32>::Type>::Value));
+	always_check((TIsSame<int32, TRemoveCV<const volatile int32>::Type>::Value));
+	always_check(!(TIsSame<int32, TRemoveCV<const volatile int32&>::Type>::Value));
 
-	always_check((TypeTraits::TIsSame<int32, TypeTraits::TRemovePointer<int32>::Type>::Value));
-	always_check((TypeTraits::TIsSame<int32, TypeTraits::TRemovePointer<int32*>::Type>::Value));
-	always_check(!(TypeTraits::TIsSame<int32, TypeTraits::TRemovePointer<int32&>::Type>::Value));
-	always_check(!(TypeTraits::TIsSame<int32, TypeTraits::TRemovePointer<int32&&>::Type>::Value));
-	always_check(!(TypeTraits::TIsSame<int32, TypeTraits::TRemovePointer<const int32>::Type>::Value));
-	always_check(!(TypeTraits::TIsSame<int32, TypeTraits::TRemovePointer<volatile int32>::Type>::Value));
-	always_check(!(TypeTraits::TIsSame<int32, TypeTraits::TRemovePointer<const volatile int32>::Type>::Value));
-	always_check(!(TypeTraits::TIsSame<int32, TypeTraits::TRemovePointer<const volatile int32&>::Type>::Value));
+	always_check((TIsSame<int32, TRemovePointer<int32>::Type>::Value));
+	always_check((TIsSame<int32, TRemovePointer<int32*>::Type>::Value));
+	always_check(!(TIsSame<int32, TRemovePointer<int32&>::Type>::Value));
+	always_check(!(TIsSame<int32, TRemovePointer<int32&&>::Type>::Value));
+	always_check(!(TIsSame<int32, TRemovePointer<const int32>::Type>::Value));
+	always_check(!(TIsSame<int32, TRemovePointer<volatile int32>::Type>::Value));
+	always_check(!(TIsSame<int32, TRemovePointer<const volatile int32>::Type>::Value));
+	always_check(!(TIsSame<int32, TRemovePointer<const volatile int32&>::Type>::Value));
 
-	always_check((TypeTraits::TIsSame<int32, TypeTraits::TRemoveReference<int32>::Type>::Value));
-	always_check(!(TypeTraits::TIsSame<int32, TypeTraits::TRemoveReference<int32*>::Type>::Value));
-	always_check((TypeTraits::TIsSame<int32, TypeTraits::TRemoveReference<int32&>::Type>::Value));
-	always_check((TypeTraits::TIsSame<int32, TypeTraits::TRemoveReference<int32&&>::Type>::Value));
-	always_check(!(TypeTraits::TIsSame<int32, TypeTraits::TRemoveReference<const int32>::Type>::Value));
-	always_check(!(TypeTraits::TIsSame<int32, TypeTraits::TRemoveReference<volatile int32>::Type>::Value));
-	always_check(!(TypeTraits::TIsSame<int32, TypeTraits::TRemoveReference<const volatile int32>::Type>::Value));
-	always_check(!(TypeTraits::TIsSame<int32, TypeTraits::TRemoveReference<const volatile int32&>::Type>::Value));
+	always_check((TIsSame<int32, TRemoveReference<int32>::Type>::Value));
+	always_check(!(TIsSame<int32, TRemoveReference<int32*>::Type>::Value));
+	always_check((TIsSame<int32, TRemoveReference<int32&>::Type>::Value));
+	always_check((TIsSame<int32, TRemoveReference<int32&&>::Type>::Value));
+	always_check(!(TIsSame<int32, TRemoveReference<const int32>::Type>::Value));
+	always_check(!(TIsSame<int32, TRemoveReference<volatile int32>::Type>::Value));
+	always_check(!(TIsSame<int32, TRemoveReference<const volatile int32>::Type>::Value));
+	always_check(!(TIsSame<int32, TRemoveReference<const volatile int32&>::Type>::Value));
 
-	always_check((TypeTraits::TIsSame<int32, TypeTraits::TRemoveCVRef<int32>::Type>::Value));
-	always_check(!(TypeTraits::TIsSame<int32, TypeTraits::TRemoveCVRef<int32*>::Type>::Value));
-	always_check((TypeTraits::TIsSame<int32, TypeTraits::TRemoveCVRef<int32&>::Type>::Value));
-	always_check((TypeTraits::TIsSame<int32, TypeTraits::TRemoveCVRef<int32&&>::Type>::Value));
-	always_check((TypeTraits::TIsSame<int32, TypeTraits::TRemoveCVRef<const int32>::Type>::Value));
-	always_check((TypeTraits::TIsSame<int32, TypeTraits::TRemoveCVRef<volatile int32>::Type>::Value));
-	always_check((TypeTraits::TIsSame<int32, TypeTraits::TRemoveCVRef<const volatile int32>::Type>::Value));
-	always_check((TypeTraits::TIsSame<int32, TypeTraits::TRemoveCVRef<const volatile int32&>::Type>::Value));
+	always_check((TIsSame<int32, TRemoveCVRef<int32>::Type>::Value));
+	always_check(!(TIsSame<int32, TRemoveCVRef<int32*>::Type>::Value));
+	always_check((TIsSame<int32, TRemoveCVRef<int32&>::Type>::Value));
+	always_check((TIsSame<int32, TRemoveCVRef<int32&&>::Type>::Value));
+	always_check((TIsSame<int32, TRemoveCVRef<const int32>::Type>::Value));
+	always_check((TIsSame<int32, TRemoveCVRef<volatile int32>::Type>::Value));
+	always_check((TIsSame<int32, TRemoveCVRef<const volatile int32>::Type>::Value));
+	always_check((TIsSame<int32, TRemoveCVRef<const volatile int32&>::Type>::Value));
 
-	always_check((TypeTraits::TIsSame<int32, TypeTraits::TRemoveExtent<int32[1]>::Type>::Value));
-	always_check(!(TypeTraits::TIsSame<int32, TypeTraits::TRemoveExtent<int32[1][2]>::Type>::Value));
-	always_check((TypeTraits::TIsSame<int32[2][3], TypeTraits::TRemoveExtent<int32[1][2][3]>::Type>::Value));
+	always_check((TIsSame<int32, TRemoveExtent<int32[1]>::Type>::Value));
+	always_check(!(TIsSame<int32, TRemoveExtent<int32[1][2]>::Type>::Value));
+	always_check((TIsSame<int32[2][3], TRemoveExtent<int32[1][2][3]>::Type>::Value));
 
-	always_check((TypeTraits::TIsSame<int32, TypeTraits::TRemoveAllExtents<int32[1]>::Type>::Value));
-	always_check((TypeTraits::TIsSame<int32, TypeTraits::TRemoveAllExtents<int32[1][2]>::Type>::Value));
-	always_check((TypeTraits::TIsSame<int32, TypeTraits::TRemoveAllExtents<int32[1][2][3]>::Type>::Value));
+	always_check((TIsSame<int32, TRemoveAllExtents<int32[1]>::Type>::Value));
+	always_check((TIsSame<int32, TRemoveAllExtents<int32[1][2]>::Type>::Value));
+	always_check((TIsSame<int32, TRemoveAllExtents<int32[1][2][3]>::Type>::Value));
 
-	always_check((TypeTraits::TIsSame<int32, TypeTraits::TMakeSigned<int32>::Type>::Value));
-	always_check((TypeTraits::TIsSame<int32, TypeTraits::TMakeSigned<uint32>::Type>::Value));
+	always_check((TIsSame<int32, TMakeSigned<int32>::Type>::Value));
+	always_check((TIsSame<int32, TMakeSigned<uint32>::Type>::Value));
 
-	always_check((TypeTraits::TIsSame<uint32, TypeTraits::TMakeUnsigned<int32>::Type>::Value));
-	always_check((TypeTraits::TIsSame<uint32, TypeTraits::TMakeUnsigned<uint32>::Type>::Value));
+	always_check((TIsSame<uint32, TMakeUnsigned<int32>::Type>::Value));
+	always_check((TIsSame<uint32, TMakeUnsigned<uint32>::Type>::Value));
 
-	TypeTraits::TAlignedStorage<32, 4>::Type Aligned4;
-	TypeTraits::TAlignedStorage<32, 8>::Type Aligned8;
-	TypeTraits::TAlignedStorage<32, 16>::Type Aligned16;
-	TypeTraits::TAlignedStorage<32, 32>::Type Aligned32;
+	TAlignedStorage<32, 4>::Type Aligned4;
+	TAlignedStorage<32, 8>::Type Aligned8;
+	TAlignedStorage<32, 16>::Type Aligned16;
+	TAlignedStorage<32, 32>::Type Aligned32;
 	always_check((int64)(&Aligned4) % 4 == 0);
 	always_check((int64)(&Aligned8) % 8 == 0);
 	always_check((int64)(&Aligned16) % 16 == 0);
 	always_check((int64)(&Aligned32) % 32 == 0);
 
-	always_check(sizeof(TypeTraits::TAlignedUnion<8, int32, int32>::Type) == 8);
-	always_check(sizeof(TypeTraits::TAlignedUnion<0, int8, int32>::Type) == 4);
-	always_check(sizeof(TypeTraits::TAlignedUnion<0, int32, int64>::Type) == 8);
-	always_check(sizeof(TypeTraits::TAlignedUnion<0, int32, double>::Type) == 8);
+	always_check(sizeof(TAlignedUnion<8, int32, int32>::Type) == 8);
+	always_check(sizeof(TAlignedUnion<0, int8, int32>::Type) == 4);
+	always_check(sizeof(TAlignedUnion<0, int32, int64>::Type) == 8);
+	always_check(sizeof(TAlignedUnion<0, int32, double>::Type) == 8);
 
-	always_check((TypeTraits::TIsSame<int32, TypeTraits::TDecay<int32>::Type>::Value));
-	always_check((TypeTraits::TIsSame<int32*, TypeTraits::TDecay<int32*>::Type>::Value));
-	always_check((TypeTraits::TIsSame<int32*, TypeTraits::TDecay<int32[]>::Type>::Value));
-	always_check((TypeTraits::TIsSame<int32, TypeTraits::TDecay<int32&>::Type>::Value));
-	always_check((TypeTraits::TIsSame<int32, TypeTraits::TDecay<int32&&>::Type>::Value));
-	always_check((TypeTraits::TIsSame<int32, TypeTraits::TDecay<const int32>::Type>::Value));
-	always_check((TypeTraits::TIsSame<int32, TypeTraits::TDecay<volatile int32>::Type>::Value));
-	always_check((TypeTraits::TIsSame<int32, TypeTraits::TDecay<const volatile int32>::Type>::Value));
-	always_check((TypeTraits::TIsSame<int32, TypeTraits::TDecay<const volatile int32&>::Type>::Value));
+	always_check((TIsSame<int32, TDecay<int32>::Type>::Value));
+	always_check((TIsSame<int32*, TDecay<int32*>::Type>::Value));
+	always_check((TIsSame<int32*, TDecay<int32[]>::Type>::Value));
+	always_check((TIsSame<int32, TDecay<int32&>::Type>::Value));
+	always_check((TIsSame<int32, TDecay<int32&&>::Type>::Value));
+	always_check((TIsSame<int32, TDecay<const int32>::Type>::Value));
+	always_check((TIsSame<int32, TDecay<volatile int32>::Type>::Value));
+	always_check((TIsSame<int32, TDecay<const volatile int32>::Type>::Value));
+	always_check((TIsSame<int32, TDecay<const volatile int32&>::Type>::Value));
 
-	always_check((TypeTraits::TIsSame<int32, TypeTraits::TConditional<true, int32, int64>::Type>::Value));
-	always_check((TypeTraits::TIsSame<int64, TypeTraits::TConditional<false, int32, int64>::Type>::Value));
+	always_check((TIsSame<int32, TConditional<true, int32, int64>::Type>::Value));
+	always_check((TIsSame<int64, TConditional<false, int32, int64>::Type>::Value));
 
-	always_check((TypeTraits::TIsSame<int32, TypeTraits::TCommonType<int8, int32>::Type>::Value));
-	always_check((TypeTraits::TIsSame<int64, TypeTraits::TCommonType<int8, int32, int64>::Type>::Value));
-	always_check((TypeTraits::TIsSame<double, TypeTraits::TCommonType<float, double>::Type>::Value));
+	always_check((TIsSame<int32, TCommonType<int8, int32>::Type>::Value));
+	always_check((TIsSame<int64, TCommonType<int8, int32, int64>::Type>::Value));
+	always_check((TIsSame<double, TCommonType<float, double>::Type>::Value));
 
-	always_check((TypeTraits::TIsSame<int, TypeTraits::TUnderlyingType<ETestEnumClass>::Type>::Value));
-	always_check((TypeTraits::TIsSame<uint8, TypeTraits::TUnderlyingType<ETestEnumClass8>::Type>::Value));
-	always_check((TypeTraits::TIsSame<uint32, TypeTraits::TUnderlyingType<ETestEnumClass32>::Type>::Value));
-	always_check((TypeTraits::TIsSame<uint64, TypeTraits::TUnderlyingType<ETestEnumClass64>::Type>::Value));
+	always_check((TIsSame<int, TUnderlyingType<ETestEnumClass>::Type>::Value));
+	always_check((TIsSame<uint8, TUnderlyingType<ETestEnumClass8>::Type>::Value));
+	always_check((TIsSame<uint32, TUnderlyingType<ETestEnumClass32>::Type>::Value));
+	always_check((TIsSame<uint64, TUnderlyingType<ETestEnumClass64>::Type>::Value));
 
-	always_check((TypeTraits::TIsSame<int32, TypeTraits::TInvokeResult<int32()>::Type>::Value));
-	always_check((TypeTraits::TIsSame<int32, TypeTraits::TInvokeResult<int32(int32), int32>::Type>::Value));
-//	always_check((TypeTraits::TIsSame<char(&)[2], TypeTraits::TInvokeResult<char(&())[2]>::Type>::Value));
+	always_check((TIsSame<int32, TInvokeResult<int32()>::Type>::Value));
+	always_check((TIsSame<int32, TInvokeResult<int32(int32), int32>::Type>::Value));
+//	always_check((TIsSame<char(&)[2], TInvokeResult<char(&())[2]>::Type>::Value));
 
-	always_check((TypeTraits::TIsSame<void, TypeTraits::TVoid<int32>::Type>::Value));
-	always_check((TypeTraits::TIsSame<void, TypeTraits::TVoid<int32, int64>::Type>::Value));
+	always_check((TIsSame<void, TVoid<int32>::Type>::Value));
+	always_check((TIsSame<void, TVoid<int32, int64>::Type>::Value));
 
 }
 
diff --git a/Redcraft.Utility/Source/Public/TypeTraits/CompositeType.h b/Redcraft.Utility/Source/Public/TypeTraits/CompositeType.h
index cf02b3d..d5811c4 100644
--- a/Redcraft.Utility/Source/Public/TypeTraits/CompositeType.h
+++ b/Redcraft.Utility/Source/Public/TypeTraits/CompositeType.h
@@ -8,7 +8,6 @@
 NAMESPACE_REDCRAFT_BEGIN
 NAMESPACE_MODULE_BEGIN(Redcraft)
 NAMESPACE_MODULE_BEGIN(Utility)
-NAMESPACE_BEGIN(TypeTraits)
 
 template <typename T> struct TIsReference     : TBoolConstant<NAMESPACE_STD::is_reference_v<T>>      { };
 template <typename T> struct TIsArithmetic    : TBoolConstant<NAMESPACE_STD::is_arithmetic_v<T>>     { };
@@ -18,7 +17,6 @@ template <typename T> struct TIsScalar        : TBoolConstant<NAMESPACE_STD::is_
 template <typename T> struct TIsCompound      : TBoolConstant<NAMESPACE_STD::is_compound_v<T>>       { };
 template <typename T> struct TIsMemberPointer : TBoolConstant<NAMESPACE_STD::is_member_pointer_v<T>> { };
 
-NAMESPACE_END(TypeTraits)
 NAMESPACE_MODULE_END(Utility)
 NAMESPACE_MODULE_END(Redcraft)
 NAMESPACE_REDCRAFT_END
diff --git a/Redcraft.Utility/Source/Public/TypeTraits/HelperClasses.h b/Redcraft.Utility/Source/Public/TypeTraits/HelperClasses.h
index 5fc760b..42c94dc 100644
--- a/Redcraft.Utility/Source/Public/TypeTraits/HelperClasses.h
+++ b/Redcraft.Utility/Source/Public/TypeTraits/HelperClasses.h
@@ -5,7 +5,6 @@
 NAMESPACE_REDCRAFT_BEGIN
 NAMESPACE_MODULE_BEGIN(Redcraft)
 NAMESPACE_MODULE_BEGIN(Utility)
-NAMESPACE_BEGIN(TypeTraits)
 
 template <typename InType, InType InValue>
 struct TConstant
@@ -23,28 +22,6 @@ using TBoolConstant = TConstant<bool, InValue>;
 using FTrue  = TBoolConstant<true>;
 using FFalse = TBoolConstant<false>;
 
-template <typename... Types> 
-struct TAnd;
-
-template <typename LHS, typename... RHS>
-struct TAnd<LHS, RHS...> : TBoolConstant<LHS::Value&& TAnd<RHS...>::Value> { };
-
-template <>
-struct TAnd<> : FTrue { };
- 
-template <typename... Types>
-struct TOr;
-
-template <typename LHS, typename... RHS>
-struct TOr<LHS, RHS...> : TBoolConstant<LHS::Value || TOr<RHS...>::Value> { };
-
-template <>
-struct TOr<> : FFalse { };
- 
-template <typename Type>
-struct TNot : TBoolConstant<!Type::Value> { };
-
-NAMESPACE_END(TypeTraits)
 NAMESPACE_MODULE_END(Utility)
 NAMESPACE_MODULE_END(Redcraft)
 NAMESPACE_REDCRAFT_END
diff --git a/Redcraft.Utility/Source/Public/TypeTraits/Miscellaneous.h b/Redcraft.Utility/Source/Public/TypeTraits/Miscellaneous.h
index e2b6495..c4c9b32 100644
--- a/Redcraft.Utility/Source/Public/TypeTraits/Miscellaneous.h
+++ b/Redcraft.Utility/Source/Public/TypeTraits/Miscellaneous.h
@@ -8,7 +8,6 @@
 NAMESPACE_REDCRAFT_BEGIN
 NAMESPACE_MODULE_BEGIN(Redcraft)
 NAMESPACE_MODULE_BEGIN(Utility)
-NAMESPACE_BEGIN(TypeTraits)
 
 NAMESPACE_PRIVATE_BEGIN
 
@@ -56,7 +55,6 @@ template <typename T>                     struct TUnderlyingType { using Type =
 template <typename F, typename... Args>   struct TInvokeResult   { using Type = NAMESPACE_STD::invoke_result_t<F, Args...>;     }; // FIXME: The result for char(&())[2] is wrong on MSVC
 template <typename... Types>              struct TVoid           { using Type = void;                                           };
 
-NAMESPACE_END(TypeTraits)
 NAMESPACE_MODULE_END(Utility)
 NAMESPACE_MODULE_END(Redcraft)
 NAMESPACE_REDCRAFT_END
diff --git a/Redcraft.Utility/Source/Public/TypeTraits/PrimaryType.h b/Redcraft.Utility/Source/Public/TypeTraits/PrimaryType.h
index eea0349..8abaf70 100644
--- a/Redcraft.Utility/Source/Public/TypeTraits/PrimaryType.h
+++ b/Redcraft.Utility/Source/Public/TypeTraits/PrimaryType.h
@@ -8,7 +8,6 @@
 NAMESPACE_REDCRAFT_BEGIN
 NAMESPACE_MODULE_BEGIN(Redcraft)
 NAMESPACE_MODULE_BEGIN(Utility)
-NAMESPACE_BEGIN(TypeTraits)
 
 template <typename T> struct TIsVoid                  : TBoolConstant<NAMESPACE_STD::is_void_v<T>>                    { };
 template <typename T> struct TIsNullPointer           : TBoolConstant<NAMESPACE_STD::is_null_pointer_v<T>>            { };
@@ -25,7 +24,6 @@ template <typename T> struct TIsUnion                 : TBoolConstant<NAMESPACE_
 template <typename T> struct TIsClass                 : TBoolConstant<NAMESPACE_STD::is_class_v<T>>                   { };
 template <typename T> struct TIsFunction              : TBoolConstant<NAMESPACE_STD::is_function_v<T>>                { };
 
-NAMESPACE_END(TypeTraits)
 NAMESPACE_MODULE_END(Utility)
 NAMESPACE_MODULE_END(Redcraft)
 NAMESPACE_REDCRAFT_END
diff --git a/Redcraft.Utility/Source/Public/TypeTraits/SupportedOperations.h b/Redcraft.Utility/Source/Public/TypeTraits/SupportedOperations.h
index b01caae..b7461dd 100644
--- a/Redcraft.Utility/Source/Public/TypeTraits/SupportedOperations.h
+++ b/Redcraft.Utility/Source/Public/TypeTraits/SupportedOperations.h
@@ -8,7 +8,6 @@
 NAMESPACE_REDCRAFT_BEGIN
 NAMESPACE_MODULE_BEGIN(Redcraft)
 NAMESPACE_MODULE_BEGIN(Utility)
-NAMESPACE_BEGIN(TypeTraits)
 
 template <typename T> struct TIsDefaultConstructible          : TBoolConstant<NAMESPACE_STD::is_default_constructible_v<T>>           { };
 template <typename T> struct TIsCopyConstructible             : TBoolConstant<NAMESPACE_STD::is_copy_constructible_v<T>>              { };
@@ -45,7 +44,6 @@ template <typename T, typename... Args> struct TIsTriviallyConstructible : TBool
 
 //template <typename T, typename... Args> struct TIsNothrowConstructible;
 
-NAMESPACE_END(TypeTraits)
 NAMESPACE_MODULE_END(Utility)
 NAMESPACE_MODULE_END(Redcraft)
 NAMESPACE_REDCRAFT_END
diff --git a/Redcraft.Utility/Source/Public/TypeTraits/TypeProperties.h b/Redcraft.Utility/Source/Public/TypeTraits/TypeProperties.h
index a6c2909..78493cf 100644
--- a/Redcraft.Utility/Source/Public/TypeTraits/TypeProperties.h
+++ b/Redcraft.Utility/Source/Public/TypeTraits/TypeProperties.h
@@ -8,7 +8,6 @@
 NAMESPACE_REDCRAFT_BEGIN
 NAMESPACE_MODULE_BEGIN(Redcraft)
 NAMESPACE_MODULE_BEGIN(Utility)
-NAMESPACE_BEGIN(TypeTraits)
 
 template <typename T> struct TIsConst                        : TBoolConstant<NAMESPACE_STD::is_const_v<T>>                          { };
 template <typename T> struct TIsVolatile                     : TBoolConstant<NAMESPACE_STD::is_volatile_v<T>>                       { };
@@ -37,9 +36,8 @@ struct TIsEnumConvertibleToInt : TBoolConstant<sizeof(Resolve(T())) - 1> { };
 NAMESPACE_PRIVATE_END
 
 template <typename T>
-struct TIsScopedEnum : TAnd<TIsEnum<T>, TNot<NAMESPACE_PRIVATE::TIsEnumConvertibleToInt<T>>> { };
+struct TIsScopedEnum : TBoolConstant<TIsEnum<T>::Value && !NAMESPACE_PRIVATE::TIsEnumConvertibleToInt<T>::Value> { };
 
-NAMESPACE_END(TypeTraits)
 NAMESPACE_MODULE_END(Utility)
 NAMESPACE_MODULE_END(Redcraft)
 NAMESPACE_REDCRAFT_END