diff options
author | Yuri Kunde Schlesner <yuriks@yuriks.net> | 2017-06-21 07:04:09 +0200 |
---|---|---|
committer | GitHub <noreply@github.com> | 2017-06-21 07:04:09 +0200 |
commit | b21dfbb2956698b05104bc68c0b08ade0d671fd8 (patch) | |
tree | 2f39f319f1391d4be12e50d1504c2bfc06b35cc2 /src/core/hle/result.h | |
parent | Merge pull request #2779 from Subv/uds_more2 (diff) | |
parent | ResultVal: Remove MoveFrom() (diff) | |
download | yuzu-b21dfbb2956698b05104bc68c0b08ade0d671fd8.tar yuzu-b21dfbb2956698b05104bc68c0b08ade0d671fd8.tar.gz yuzu-b21dfbb2956698b05104bc68c0b08ade0d671fd8.tar.bz2 yuzu-b21dfbb2956698b05104bc68c0b08ade0d671fd8.tar.lz yuzu-b21dfbb2956698b05104bc68c0b08ade0d671fd8.tar.xz yuzu-b21dfbb2956698b05104bc68c0b08ade0d671fd8.tar.zst yuzu-b21dfbb2956698b05104bc68c0b08ade0d671fd8.zip |
Diffstat (limited to '')
-rw-r--r-- | src/core/hle/result.h | 7 |
1 files changed, 4 insertions, 3 deletions
diff --git a/src/core/hle/result.h b/src/core/hle/result.h index 5f2cdbb96..47b6e2b23 100644 --- a/src/core/hle/result.h +++ b/src/core/hle/result.h @@ -388,13 +388,14 @@ public: } /// Asserts that the result succeeded and returns a reference to it. - T& Unwrap() { + T& Unwrap() & { ASSERT_MSG(Succeeded(), "Tried to Unwrap empty ResultVal"); return **this; } - T&& MoveFrom() { - return std::move(Unwrap()); + T&& Unwrap() && { + ASSERT_MSG(Succeeded(), "Tried to Unwrap empty ResultVal"); + return std::move(**this); } private: |