drew
/
acadia
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases 1 Wiki Activity

[glacier] Update ErrorOr to work with Move.

This commit is contained in:
Drew Galbraith 2023-06-26 11:37:56 -07:00
parent 84d3c33938
commit 16c30d12fb
1 changed files with 3 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

5
lib/glacier/status/error_or.h
View File

@ -1,5 +1,6 @@
#pragma once #pragma once
#include <glacier/memory/move.h>
#include <glacier/status/error.h> #include <glacier/status/error.h>
namespace glcr { namespace glcr {
@ -15,7 +16,7 @@ class ErrorOr {
ErrorOr(ErrorCode code) : error_(code), ok_(false) {} ErrorOr(ErrorCode code) : error_(code), ok_(false) {}
ErrorOr(const T& obj) : obj_(obj), ok_(true) {} ErrorOr(const T& obj) : obj_(obj), ok_(true) {}
ErrorOr(T&& obj) : obj_(obj), ok_(true) {} ErrorOr(T&& obj) : obj_(glcr::Move(obj)), ok_(true) {}
bool ok() { return ok_; } bool ok() { return ok_; }
operator bool() { return ok_; } operator bool() { return ok_; }
@ -41,6 +42,6 @@ class ErrorOr {
if (!AOR_VAR(__LINE__).ok()) { \ if (!AOR_VAR(__LINE__).ok()) { \
return AOR_VAR(__LINE__).error(); \ return AOR_VAR(__LINE__).error(); \
} \ } \
lhs = AOR_VAR(__LINE__).value(); lhs = glcr::Move(AOR_VAR(__LINE__).value());
} // namespace glcr } // namespace glcr