From 38902eb77988918401117c70b3cefbc1098c7865 Mon Sep 17 00:00:00 2001
From: _Redstone_c_ <myredstone1024@gmail.com>
Date: Sat, 30 Apr 2022 19:25:17 +0800
Subject: [PATCH] fix(typetraits): fix implementation of TIsScopedEnum
TIsSwappable and TIsBitwiseConstructible
---
.../Source/Private/Testing/ConceptsTesting.cpp | 2 +-
.../Source/Private/Testing/TypeTraitsTesting.cpp | 2 +-
.../Source/Public/TypeTraits/BitwiseOperations.h | 13 ++++++++-----
.../Source/Public/TypeTraits/Swappable.h | 13 +++++++++----
.../Source/Public/TypeTraits/TypeProperties.h | 13 ++-----------
5 files changed, 21 insertions(+), 22 deletions(-)
diff --git a/Redcraft.Utility/Source/Private/Testing/ConceptsTesting.cpp b/Redcraft.Utility/Source/Private/Testing/ConceptsTesting.cpp
index 5d5d25d..0208125 100644
--- a/Redcraft.Utility/Source/Private/Testing/ConceptsTesting.cpp
+++ b/Redcraft.Utility/Source/Private/Testing/ConceptsTesting.cpp
@@ -10,7 +10,7 @@ NAMESPACE_MODULE_BEGIN(Utility)
NAMESPACE_BEGIN(Testing)
-// Warning: The test here is not a complete test, it is only used to determine whether the environment supports the concepts
+// WARNING: The test here is not a complete test, it is only used to determine whether the environment supports the concepts
NAMESPACE_UNNAMED_BEGIN
diff --git a/Redcraft.Utility/Source/Private/Testing/TypeTraitsTesting.cpp b/Redcraft.Utility/Source/Private/Testing/TypeTraitsTesting.cpp
index 4e01ba2..26726a1 100644
--- a/Redcraft.Utility/Source/Private/Testing/TypeTraitsTesting.cpp
+++ b/Redcraft.Utility/Source/Private/Testing/TypeTraitsTesting.cpp
@@ -10,7 +10,7 @@ NAMESPACE_MODULE_BEGIN(Utility)
NAMESPACE_BEGIN(Testing)
-// Warning: The test here is not a complete test, it is only used to determine whether the environment supports the traits
+// WARNING: The test here is not a complete test, it is only used to determine whether the environment supports the traits
NAMESPACE_UNNAMED_BEGIN
diff --git a/Redcraft.Utility/Source/Public/TypeTraits/BitwiseOperations.h b/Redcraft.Utility/Source/Public/TypeTraits/BitwiseOperations.h
index 02286ae..a087239 100644
--- a/Redcraft.Utility/Source/Public/TypeTraits/BitwiseOperations.h
+++ b/Redcraft.Utility/Source/Public/TypeTraits/BitwiseOperations.h
@@ -35,11 +35,9 @@ template <typename T, typename U> struct TIsBitwiseConstructible<const volatile
template <typename T, typename U> struct TIsBitwiseConstructible<const volatile T, volatile U> : TIsBitwiseConstructible<T, U> { };
template <typename T, typename U> struct TIsBitwiseConstructible<const volatile T, const volatile U> : TIsBitwiseConstructible<T, U> { };
-template <typename T> struct TIsBitwiseConstructible<T, T> : TIsTriviallyCopyConstructible<T> { };
+template <typename T, typename U> struct TIsBitwiseConstructible<T*, U*> : TIsConvertible<U*, T*> { };
-template <typename T, typename U> struct TIsBitwiseConstructible<T*, U*> : TBoolConstant<TIsSame<typename TRemoveCV<T>::Type, typename TRemoveCV<U>::Type>::Value> { };
-
-template <typename T, typename U> struct TIsBitwiseConstructible : FFalse { };
+template <typename T, typename U> struct TIsBitwiseConstructible : TBoolConstant<TIsSame<T, U>::Value ? TIsTriviallyCopyConstructible<T>::Value : false> { };
template <> struct TIsBitwiseConstructible<uint8, int8> : FTrue { };
template <> struct TIsBitwiseConstructible< int8, uint8> : FTrue { };
@@ -50,6 +48,11 @@ template <> struct TIsBitwiseConstructible< int32, uint32> : FTrue { };
template <> struct TIsBitwiseConstructible<uint64, int64> : FTrue { };
template <> struct TIsBitwiseConstructible< int64, uint64> : FTrue { };
+template <typename T> struct TIsBitwiseConstructible<T*, intptr> : FTrue { };
+template <typename T> struct TIsBitwiseConstructible<T*, uintptr> : FTrue { };
+template <typename T> struct TIsBitwiseConstructible< intptr, T*> : FTrue { };
+template <typename T> struct TIsBitwiseConstructible<uintptr, T*> : FTrue { };
+
// It is usually only necessary to specialize TIsBitwiseConstructible and not recommended to specialize TIsBitwiseRelocatable.
template <typename T, typename U> struct TIsBitwiseRelocatable;
@@ -69,7 +72,7 @@ template <typename T, typename U> struct TIsBitwiseRelocatable<const volatile T,
template <typename T, typename U> struct TIsBitwiseRelocatable<const volatile T, volatile U> : TIsBitwiseRelocatable<T, U> { };
template <typename T, typename U> struct TIsBitwiseRelocatable<const volatile T, const volatile U> : TIsBitwiseRelocatable<T, U> { };
-template <typename T> struct TIsBitwiseRelocatable<T, T> : FTrue { };
+template <typename T> struct TIsBitwiseRelocatable<T, T> : TBoolConstant<!TIsVoid<T>::Value> { };
template <typename T, typename U> struct TIsBitwiseRelocatable : TBoolConstant<TIsBitwiseConstructible<T, U>::Value && TIsTriviallyDestructible<U>::Value> { };
diff --git a/Redcraft.Utility/Source/Public/TypeTraits/Swappable.h b/Redcraft.Utility/Source/Public/TypeTraits/Swappable.h
index 8ef79e9..2e2817d 100644
--- a/Redcraft.Utility/Source/Public/TypeTraits/Swappable.h
+++ b/Redcraft.Utility/Source/Public/TypeTraits/Swappable.h
@@ -10,18 +10,23 @@ NAMESPACE_MODULE_BEGIN(Utility)
NAMESPACE_PRIVATE_BEGIN
+template <typename T>
+concept CSwappable = requires(T & A, T & B) { Swap(A, B); };
+
template <typename T, typename U>
concept CSwappableWith =
requires(T&& A, U&& B)
{
- Swap(A, B);
- Swap(B, A);
+ Swap(Forward<T>(A), Forward<T>(A));
+ Swap(Forward<U>(B), Forward<U>(B));
+ Swap(Forward<T>(A), Forward<U>(B));
+ Swap(Forward<U>(B), Forward<T>(A));
};
NAMESPACE_PRIVATE_END
-template <typename T> struct TIsSwappable : TBoolConstant<NAMESPACE_PRIVATE::CSwappableWith<T&, T&>> { };
-template <typename T, typename U> struct TIsSwappableWith : TBoolConstant<NAMESPACE_PRIVATE::CSwappableWith<T , U >> { };
+template <typename T> struct TIsSwappable : TBoolConstant<NAMESPACE_PRIVATE::CSwappable<T>> { };
+template <typename T, typename U> struct TIsSwappableWith : TBoolConstant<NAMESPACE_PRIVATE::CSwappableWith<T, U>> { };
//template <typename T> struct TIsNothrowSwappable;
//template <typename T, typename U> struct TIsNothrowSwappableWith;
diff --git a/Redcraft.Utility/Source/Public/TypeTraits/TypeProperties.h b/Redcraft.Utility/Source/Public/TypeTraits/TypeProperties.h
index 78493cf..37fe317 100644
--- a/Redcraft.Utility/Source/Public/TypeTraits/TypeProperties.h
+++ b/Redcraft.Utility/Source/Public/TypeTraits/TypeProperties.h
@@ -2,6 +2,7 @@
#include "CoreTypes.h"
#include "TypeTraits/HelperClasses.h"
+#include "TypeTraits/Miscellaneous.h"
#include <type_traits>
@@ -25,18 +26,8 @@ template <typename T> struct TIsUnsigned : TBoolConstant<NAM
template <typename T> struct TIsBoundedArray : TBoolConstant<NAMESPACE_STD::is_bounded_array_v<T>> { };
template <typename T> struct TIsUnboundedArray : TBoolConstant<NAMESPACE_STD::is_unbounded_array_v<T>> { };
-NAMESPACE_PRIVATE_BEGIN
-
-uint8(&Resolve(int64))[2];
-uint8 Resolve(...);
-
template <typename T>
-struct TIsEnumConvertibleToInt : TBoolConstant<sizeof(Resolve(T())) - 1> { };
-
-NAMESPACE_PRIVATE_END
-
-template <typename T>
-struct TIsScopedEnum : TBoolConstant<TIsEnum<T>::Value && !NAMESPACE_PRIVATE::TIsEnumConvertibleToInt<T>::Value> { };
+struct TIsScopedEnum : TBoolConstant<TIsEnum<T>::Value && !TIsConvertible<T, int64>::Value> { };
NAMESPACE_MODULE_END(Utility)
NAMESPACE_MODULE_END(Redcraft)