apio/Luna
1
1
Fork 0
Code Issues Pull Requests Actions Projects Releases 8 Wiki Activity

SharedPtr: Implement make_shared using adopt_shared
All checks were successful
continuous-integration/drone/pr Build is passing
Details

Browse Source
This commit is contained in:
apio 2023-02-14 19:59:44 +01:00
parent cb4246b98d
commit 79078ff21e
Signed by: apio
GPG Key ID: B8A7D06E42258954
1 changed files with 6 additions and 13 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

19
luna/include/luna/SharedPtr.h
View File

@ -104,19 +104,6 @@ template <typename T> class SharedPtr
RefCount* m_ref_count; RefCount* m_ref_count;
}; };
template <typename T, class... Args> Result<SharedPtr<T>> make_shared(Args... args)
{
using RefCount = __detail::RefCount;
RefCount* const ref_count = TRY(make<RefCount>());
auto guard = make_scope_guard([&] { delete ref_count; });
T* const ptr = TRY(make<T>(args...));
guard.deactivate();
return SharedPtr<T> { ptr, ref_count };
}
// NOTE: ptr is deleted if any of the adopt_shared* functions fail to construct a SharedPtr. // NOTE: ptr is deleted if any of the adopt_shared* functions fail to construct a SharedPtr.
template <typename T> Result<SharedPtr<T>> adopt_shared(T* ptr) template <typename T> Result<SharedPtr<T>> adopt_shared(T* ptr)
{ {
@ -131,6 +118,12 @@ template <typename T> Result<SharedPtr<T>> adopt_shared(T* ptr)
return SharedPtr<T> { ptr, ref_count }; return SharedPtr<T> { ptr, ref_count };
} }
template <typename T, class... Args> Result<SharedPtr<T>> make_shared(Args... args)
{
T* raw_ptr = TRY(make<T>(args...));
return adopt_shared(raw_ptr);
}
template <typename T> Result<SharedPtr<T>> adopt_shared_if_nonnull(T* ptr) template <typename T> Result<SharedPtr<T>> adopt_shared_if_nonnull(T* ptr)
{ {
if (ptr) return adopt_shared(ptr); if (ptr) return adopt_shared(ptr);