diff options
| author | Yuri Kunde Schlesner <yuriks@yuriks.net> | 2017-06-20 22:04:09 -0700 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2017-06-20 22:04:09 -0700 |
| commit | 03964e9cd2f77bca5efbe2958f6ed8d09dc006f1 (patch) | |
| tree | 2f39f319f1391d4be12e50d1504c2bfc06b35cc2 /src/core/hle/kernel/timer.cpp | |
| parent | b91c1e214c5930ead85f4f7734f266907dc6606c (diff) | |
| parent | c27dad4cd11fe9b41a30b5860d24371dcdc46831 (diff) | |
Merge pull request #2790 from yuriks/remove-movefrom
Remove ResultVal::MoveFrom
Diffstat (limited to 'src/core/hle/kernel/timer.cpp')
| -rw-r--r-- | src/core/hle/kernel/timer.cpp | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/src/core/hle/kernel/timer.cpp b/src/core/hle/kernel/timer.cpp index 6f2cf3b028..d7ec93672f 100644 --- a/src/core/hle/kernel/timer.cpp +++ b/src/core/hle/kernel/timer.cpp @@ -30,7 +30,7 @@ SharedPtr<Timer> Timer::Create(ResetType reset_type, std::string name) { timer->name = std::move(name); timer->initial_delay = 0; timer->interval_delay = 0; - timer->callback_handle = timer_callback_handle_table.Create(timer).MoveFrom(); + timer->callback_handle = timer_callback_handle_table.Create(timer).Unwrap(); return timer; } |