RGBCube/serenity
1
Fork 0
mirror of https://github.com/RGBCube/serenity synced 2025-07-27 02:47:35 +00:00
Code Issues Activity Actions

AK: Convert the try_make<T> factory function to use ErrorOr

Browse source 
This allows more ergonomic memory allocation failure related error
checking using the TRY macro.
This commit is contained in:
Idan Horowitz 2022-02-03 17:19:53 +02:00 • committed by Andreas Kling
parent ba0a2a3e2f
commit 18b98f8c28
2 changed files with 8 additions and 7 deletions
Download patch file Download diff file Expand all files Collapse all files

8
AK/OwnPtr.h
View file

@ -215,17 +215,17 @@ inline ErrorOr<NonnullOwnPtr<T>> adopt_nonnull_own_or_enomem(T* object)
}
template<typename T, class... Args>
requires(IsConstructible<T, Args...>) inline OwnPtr<T> try_make(Args&&... args)
requires(IsConstructible<T, Args...>) inline ErrorOr<NonnullOwnPtr<T>> try_make(Args&&... args)
{
return adopt_own_if_nonnull(new (nothrow) T(forward<Args>(args)...));
return adopt_nonnull_own_or_enomem(new (nothrow) T(forward<Args>(args)...));
}
// FIXME: Remove once P0960R3 is available in Clang.
template<typename T, class... Args>
inline OwnPtr<T> try_make(Args&&... args)
inline ErrorOr<NonnullOwnPtr<T>> try_make(Args&&... args)
{
return adopt_own_if_nonnull(new (nothrow) T { forward<Args>(args)... });
return adopt_nonnull_own_or_enomem(new (nothrow) T { forward<Args>(args)... });
}
template<typename T>