RGBCube/serenity
1
Fork 0
mirror of https://github.com/RGBCube/serenity synced 2025-07-26 11:37:44 +00:00
Code Issues Activity Actions

AK: Make Error and ErrorOr<T> work in Lagom as well :^)

Browse source 
ErrnoCode is not a thing outside __serenity__, so let's not make
assumptions about it existing.
This commit is contained in:
Andreas Kling 2021-11-06 22:16:50 +01:00
parent 6e255b262f
commit 202950bb01
2 changed files with 5 additions and 3 deletions
Download patch file Download diff file Expand all files Collapse all files

6
AK/Error.h
View file

@ -56,10 +56,12 @@ public:
{ {
} }
ErrorOr(ErrnoCode errno) #ifdef __serenity__
: m_error(Error::from_errno(errno)) ErrorOr(ErrnoCode code)
: m_error(Error::from_errno(code))
{ {
} }
#endif
ErrorOr(Error&& error) ErrorOr(Error&& error)
: m_error(move(error)) : m_error(move(error))

2
AK/RefPtr.h
View file

@ -353,7 +353,7 @@ inline ErrorOr<NonnullRefPtr<T>> adopt_nonnull_ref_or_enomem(T* object)
{ {
auto result = adopt_ref_if_nonnull(object); auto result = adopt_ref_if_nonnull(object);
if (!result) if (!result)
return ENOMEM; return Error::from_errno(ENOMEM);
return result.release_nonnull(); return result.release_nonnull();
} }