diff options
| author | 2017-06-20 22:04:09 -0700 | |
|---|---|---|
| committer | 2017-06-20 22:04:09 -0700 | |
| commit | b21dfbb2956698b05104bc68c0b08ade0d671fd8 (patch) | |
| tree | 2f39f319f1391d4be12e50d1504c2bfc06b35cc2 /src/core/hle/kernel/timer.cpp | |
| parent | Merge pull request #2779 from Subv/uds_more2 (diff) | |
| parent | ResultVal: Remove MoveFrom() (diff) | |
| download | yuzu-b21dfbb2956698b05104bc68c0b08ade0d671fd8.tar.gz yuzu-b21dfbb2956698b05104bc68c0b08ade0d671fd8.tar.xz yuzu-b21dfbb2956698b05104bc68c0b08ade0d671fd8.zip | |
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 6f2cf3b02..d7ec93672 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) { | |||
| 30 | timer->name = std::move(name); | 30 | timer->name = std::move(name); |
| 31 | timer->initial_delay = 0; | 31 | timer->initial_delay = 0; |
| 32 | timer->interval_delay = 0; | 32 | timer->interval_delay = 0; |
| 33 | timer->callback_handle = timer_callback_handle_table.Create(timer).MoveFrom(); | 33 | timer->callback_handle = timer_callback_handle_table.Create(timer).Unwrap(); |
| 34 | 34 | ||
| 35 | return timer; | 35 | return timer; |
| 36 | } | 36 | } |