summaryrefslogtreecommitdiff
path: root/src/core/hle/kernel/timer.cpp
diff options
context:
space:
mode:
authorGravatar Yuri Kunde Schlesner2017-06-18 19:03:15 -0700
committerGravatar Yuri Kunde Schlesner2017-06-18 19:03:15 -0700
commit723dc644faa6e29250d1b7fa914dfb7c75d8aec5 (patch)
treec7ad927e2cbe1424046e279b3212ac895f4b1e87 /src/core/hle/kernel/timer.cpp
parentResultVal: Add an rvalue overload of Unwrap() (diff)
downloadyuzu-723dc644faa6e29250d1b7fa914dfb7c75d8aec5.tar.gz
yuzu-723dc644faa6e29250d1b7fa914dfb7c75d8aec5.tar.xz
yuzu-723dc644faa6e29250d1b7fa914dfb7c75d8aec5.zip
ResultVal: Remove MoveFrom()
Replace it with std::move(result_val).Unwrap(), or Foo().Unwrap() in case you already have an rvalue.
Diffstat (limited to 'src/core/hle/kernel/timer.cpp')
-rw-r--r--src/core/hle/kernel/timer.cpp2
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}