mirror of
https://github.com/yuzu-emu/yuzu.git
synced 2024-08-21 15:53:23 +02:00
Merge pull request #7241 from Morph1984/resultval-move-assignment
hle/result: Add move assignment operator in ResultVal
This commit is contained in:
commit
c1b199bd21
@ -206,7 +206,7 @@ public:
|
|||||||
return result;
|
return result;
|
||||||
}
|
}
|
||||||
|
|
||||||
ResultVal(const ResultVal& o) : result_code(o.result_code) {
|
ResultVal(const ResultVal& o) noexcept : result_code(o.result_code) {
|
||||||
if (!o.empty()) {
|
if (!o.empty()) {
|
||||||
new (&object) T(o.object);
|
new (&object) T(o.object);
|
||||||
}
|
}
|
||||||
@ -224,7 +224,7 @@ public:
|
|||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
|
||||||
ResultVal& operator=(const ResultVal& o) {
|
ResultVal& operator=(const ResultVal& o) noexcept {
|
||||||
if (this == &o) {
|
if (this == &o) {
|
||||||
return *this;
|
return *this;
|
||||||
}
|
}
|
||||||
@ -244,6 +244,26 @@ public:
|
|||||||
return *this;
|
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
|
* Replaces the current result with a new constructed result value in-place. The code must not
|
||||||
* be an error code.
|
* be an error code.
|
||||||
|
Loading…
Reference in New Issue
Block a user