diff options
author | Morph <39850852+Morph1984@users.noreply.github.com> | 2021-10-28 09:52:21 +0200 |
---|---|---|
committer | Morph <39850852+Morph1984@users.noreply.github.com> | 2021-10-28 09:52:21 +0200 |
commit | 189927c237cc4cfd38af2da5f25891c30d84e6dc (patch) | |
tree | cb4bb570f51aed39c4242d39ad68c0f3accaf9ed /src/core | |
parent | Merge pull request #7186 from MightyCreak/fix-crash-configure-window (diff) | |
download | yuzu-189927c237cc4cfd38af2da5f25891c30d84e6dc.tar yuzu-189927c237cc4cfd38af2da5f25891c30d84e6dc.tar.gz yuzu-189927c237cc4cfd38af2da5f25891c30d84e6dc.tar.bz2 yuzu-189927c237cc4cfd38af2da5f25891c30d84e6dc.tar.lz yuzu-189927c237cc4cfd38af2da5f25891c30d84e6dc.tar.xz yuzu-189927c237cc4cfd38af2da5f25891c30d84e6dc.tar.zst yuzu-189927c237cc4cfd38af2da5f25891c30d84e6dc.zip |
Diffstat (limited to 'src/core')
-rw-r--r-- | src/core/hle/result.h | 20 |
1 files changed, 20 insertions, 0 deletions
diff --git a/src/core/hle/result.h b/src/core/hle/result.h index a755008d5..ffef46794 100644 --- a/src/core/hle/result.h +++ b/src/core/hle/result.h @@ -244,6 +244,26 @@ public: return *this; } + ResultVal& operator=(ResultVal&& o) { + if (this == &o) { + return *this; + } + if (!empty()) { + if (!o.empty()) { + object = std::move(o.object); + } else { + object.~T(); + } + } else { + if (!o.empty()) { + new (&object) T(std::move(o.object)); + } + } + result_code = o.result_code; + + return *this; + } + /** * Replaces the current result with a new constructed result value in-place. The code must not * be an error code. |