diff options
| author |  Yuri Kunde Schlesner | 2015-09-11 23:23:33 -0300 |
|---|---|---|
| committer | Yuri Kunde Schlesner | 2015-09-11 23:23:33 -0300 |
| commit | 042cc00150fd2fc54bc530522de9993ccf715bae (patch) | |
| tree | 0971410cd6f62dbb210e87aa3494f7f380802b74 /src | |
| parent | Merge pull request #1147 from lioncash/nullptr (diff) | |
| parent | synchronized_wrapper: Add missing return in SynchronizedRef move assignment o... (diff) | |
| download | yuzu-042cc00150fd2fc54bc530522de9993ccf715bae.tar.gz yuzu-042cc00150fd2fc54bc530522de9993ccf715bae.tar.xz yuzu-042cc00150fd2fc54bc530522de9993ccf715bae.zip | |
Merge pull request #1151 from lioncash/return
synchronized_wrapper: Add missing return in SynchronizedRef move assignment operator
Diffstat (limited to 'src')
| -rw-r--r-- | src/common/synchronized_wrapper.h | 1 |
1 files changed, 1 insertions, 0 deletions
diff --git a/src/common/synchronized_wrapper.h b/src/common/synchronized_wrapper.h index ae5e8b1ed..07105a198 100644 --- a/src/common/synchronized_wrapper.h +++ b/src/common/synchronized_wrapper.h | |||
| @@ -55,6 +55,7 @@ public: | |||
| 55 | SynchronizedRef& operator=(SynchronizedRef&) = delete; | 55 | SynchronizedRef& operator=(SynchronizedRef&) = delete; |
| 56 | SynchronizedRef& operator=(SynchronizedRef&& o) { | 56 | SynchronizedRef& operator=(SynchronizedRef&& o) { |
| 57 | std::swap(wrapper, o.wrapper); | 57 | std::swap(wrapper, o.wrapper); |
| 58 | return *this; | ||
| 58 | } | 59 | } |
| 59 | 60 | ||
| 60 | T& operator*() { return wrapper->data; } | 61 | T& operator*() { return wrapper->data; } |