Redstone1024/Redcraft
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

fix(templates): fix TSharedFromThis not working for indirectly derived

Browse Source
This commit is contained in:
_Redstone_c_ 2023-01-15 18:14:09 +08:00
parent 78979b414a
commit 5c2c1b4a48
1 changed files with 22 additions and 15 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

35
Redcraft.Utility/Source/Public/Templates/SharedPointer.h
View File

@ -521,15 +521,18 @@ public:
protected: protected:
FORCEINLINE TSharedFromThis() = default; FORCEINLINE constexpr TSharedFromThis() : WeakThis() { }
FORCEINLINE TSharedFromThis(const TSharedFromThis&) = default;
FORCEINLINE TSharedFromThis(TSharedFromThis&&) = default; FORCEINLINE TSharedFromThis(const TSharedFromThis&) : TSharedFromThis() { }
FORCEINLINE TSharedFromThis& operator=(const TSharedFromThis&) = default;
FORCEINLINE TSharedFromThis& operator=(TSharedFromThis&&) = default; FORCEINLINE TSharedFromThis& operator=(const TSharedFromThis&) { return *this; }
FORCEINLINE ~TSharedFromThis() = default;
FORCEINLINE ~TSharedFromThis() = default;
private: private:
using SharedFromThisType = TSharedFromThis;
// Here it is updated by the private constructor of TSharedRef or TSharedPtr. // Here it is updated by the private constructor of TSharedRef or TSharedPtr.
mutable TWeakPtr<T> WeakThis; mutable TWeakPtr<T> WeakThis;
@ -731,15 +734,17 @@ private:
{ {
check(!((Pointer == nullptr) ^ (Controller == nullptr))); check(!((Pointer == nullptr) ^ (Controller == nullptr)));
if constexpr (CClass<T>) if constexpr (CClass<T> && !CVolatile<T> && requires { typename T::SharedFromThisType; })
{ {
if constexpr (CDerivedFrom<T, TSharedFromThis<T>>) using SharedFromThisType = T::SharedFromThisType;
if constexpr (CDerivedFrom<T, SharedFromThisType>)
{ {
if (Pointer != nullptr) if (Pointer != nullptr)
{ {
const TSharedFromThis<T>& SharedFromThis = *Pointer; const SharedFromThisType& SharedFromThis = *Pointer;
checkf(!SharedFromThis.DoesSharedInstanceExist(), TEXT("This object is incorrectly managed by multiple TSharedRef or TSharedPtr.")); checkf(!SharedFromThis.DoesSharedInstanceExist(), TEXT("This object is incorrectly managed by multiple TSharedRef or TSharedPtr."));
SharedFromThis.WeakThis = *this; SharedFromThis.WeakThis = ConstCast<TRemoveCV<T>>(*this);
} }
} }
} }
@ -1206,15 +1211,17 @@ private:
{ {
check(!((Pointer == nullptr) ^ (Controller == nullptr))); check(!((Pointer == nullptr) ^ (Controller == nullptr)));
if constexpr (CClass<T>) if constexpr (CClass<T> && !CVolatile<T> && requires { typename T::SharedFromThisType; })
{ {
if constexpr (CDerivedFrom<T, TSharedFromThis<T>>) using SharedFromThisType = T::SharedFromThisType;
if constexpr (CDerivedFrom<T, SharedFromThisType>)
{ {
if (Pointer != nullptr) if (Pointer != nullptr)
{ {
const TSharedFromThis<T>& SharedFromThis = *Pointer; const SharedFromThisType& SharedFromThis = *Pointer;
checkf(!SharedFromThis.DoesSharedInstanceExist(), TEXT("This object is incorrectly managed by multiple TSharedRef or TSharedPtr.")); checkf(!SharedFromThis.DoesSharedInstanceExist(), TEXT("This object is incorrectly managed by multiple TSharedRef or TSharedPtr."));
SharedFromThis.WeakThis = *this; SharedFromThis.WeakThis = ConstCast<TRemoveCV<T>>(*this);
} }
} }
} }