Browse Source
Merge pull request #7241 from Morph1984/resultval-move-assignment
hle/result: Add move assignment operator in ResultVal
pull/15/merge
bunnei
4 years ago
committed by
GitHub
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
1 changed files with
22 additions and
2 deletions
-
src/core/hle/result.h
|
|
|
@ -206,7 +206,7 @@ public: |
|
|
|
return result; |
|
|
|
} |
|
|
|
|
|
|
|
ResultVal(const ResultVal& o) : result_code(o.result_code) { |
|
|
|
ResultVal(const ResultVal& o) noexcept : result_code(o.result_code) { |
|
|
|
if (!o.empty()) { |
|
|
|
new (&object) T(o.object); |
|
|
|
} |
|
|
|
@ -224,7 +224,7 @@ public: |
|
|
|
} |
|
|
|
} |
|
|
|
|
|
|
|
ResultVal& operator=(const ResultVal& o) { |
|
|
|
ResultVal& operator=(const ResultVal& o) noexcept { |
|
|
|
if (this == &o) { |
|
|
|
return *this; |
|
|
|
} |
|
|
|
@ -244,6 +244,26 @@ public: |
|
|
|
return *this; |
|
|
|
} |
|
|
|
|
|
|
|
ResultVal& operator=(ResultVal&& o) noexcept { |
|
|
|
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. |
|
|
|
|