diff options
| author |  Subv | 2015-02-07 13:05:17 -0500 |
|---|---|---|
| committer |  Yuri Kunde Schlesner | 2015-02-10 13:43:44 -0200 |
| commit | ca1a87ef7d32a938c1ed3a59f8638cca54071a24 (patch) | |
| tree | d1cc8339728f3ca029f4dbd66de86306669f73ac /src | |
| parent | FS: Allow multiple instances of the same archive type to be open at once (diff) | |
| download | yuzu-ca1a87ef7d32a938c1ed3a59f8638cca54071a24.tar.gz yuzu-ca1a87ef7d32a938c1ed3a59f8638cca54071a24.tar.xz yuzu-ca1a87ef7d32a938c1ed3a59f8638cca54071a24.zip | |
ResultVal: Fixed compilation when reassigning a ResultVal.
Diffstat (limited to 'src')
| -rw-r--r-- | src/core/hle/result.h | 6 |
1 files changed, 3 insertions, 3 deletions
diff --git a/src/core/hle/result.h b/src/core/hle/result.h index 948b9e38e..9c6ca29e5 100644 --- a/src/core/hle/result.h +++ b/src/core/hle/result.h | |||
| @@ -307,14 +307,14 @@ public: | |||
| 307 | } | 307 | } |
| 308 | 308 | ||
| 309 | ResultVal& operator=(const ResultVal& o) { | 309 | ResultVal& operator=(const ResultVal& o) { |
| 310 | if (*this) { | 310 | if (!empty()) { |
| 311 | if (o) { | 311 | if (!o.empty()) { |
| 312 | *GetPointer() = *o.GetPointer(); | 312 | *GetPointer() = *o.GetPointer(); |
| 313 | } else { | 313 | } else { |
| 314 | GetPointer()->~T(); | 314 | GetPointer()->~T(); |
| 315 | } | 315 | } |
| 316 | } else { | 316 | } else { |
| 317 | if (o) { | 317 | if (!o.empty()) { |
| 318 | new (&storage) T(*o.GetPointer()); | 318 | new (&storage) T(*o.GetPointer()); |
| 319 | } | 319 | } |
| 320 | } | 320 | } |