summaryrefslogtreecommitdiff
path: root/src/core/hle/service/cecd
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/service/cecd
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/service/cecd')
-rw-r--r--src/core/hle/service/cecd/cecd.cpp8
1 files changed, 4 insertions, 4 deletions
diff --git a/src/core/hle/service/cecd/cecd.cpp b/src/core/hle/service/cecd/cecd.cpp
index bd9814244..421006a9e 100644
--- a/src/core/hle/service/cecd/cecd.cpp
+++ b/src/core/hle/service/cecd/cecd.cpp
@@ -31,8 +31,8 @@ void GetCecStateAbbreviated(Service::Interface* self) {
31void GetCecInfoEventHandle(Service::Interface* self) { 31void GetCecInfoEventHandle(Service::Interface* self) {
32 u32* cmd_buff = Kernel::GetCommandBuffer(); 32 u32* cmd_buff = Kernel::GetCommandBuffer();
33 33
34 cmd_buff[1] = RESULT_SUCCESS.raw; // No error 34 cmd_buff[1] = RESULT_SUCCESS.raw; // No error
35 cmd_buff[3] = Kernel::g_handle_table.Create(cecinfo_event).MoveFrom(); // Event handle 35 cmd_buff[3] = Kernel::g_handle_table.Create(cecinfo_event).Unwrap(); // Event handle
36 36
37 LOG_WARNING(Service_CECD, "(STUBBED) called"); 37 LOG_WARNING(Service_CECD, "(STUBBED) called");
38} 38}
@@ -40,8 +40,8 @@ void GetCecInfoEventHandle(Service::Interface* self) {
40void GetChangeStateEventHandle(Service::Interface* self) { 40void GetChangeStateEventHandle(Service::Interface* self) {
41 u32* cmd_buff = Kernel::GetCommandBuffer(); 41 u32* cmd_buff = Kernel::GetCommandBuffer();
42 42
43 cmd_buff[1] = RESULT_SUCCESS.raw; // No error 43 cmd_buff[1] = RESULT_SUCCESS.raw; // No error
44 cmd_buff[3] = Kernel::g_handle_table.Create(change_state_event).MoveFrom(); // Event handle 44 cmd_buff[3] = Kernel::g_handle_table.Create(change_state_event).Unwrap(); // Event handle
45 45
46 LOG_WARNING(Service_CECD, "(STUBBED) called"); 46 LOG_WARNING(Service_CECD, "(STUBBED) called");
47} 47}