diff options
| author | 2017-06-18 19:03:15 -0700 | |
|---|---|---|
| committer | 2017-06-18 19:03:15 -0700 | |
| commit | 723dc644faa6e29250d1b7fa914dfb7c75d8aec5 (patch) | |
| tree | c7ad927e2cbe1424046e279b3212ac895f4b1e87 /src/core/hle/service/hid | |
| parent | ResultVal: Add an rvalue overload of Unwrap() (diff) | |
| download | yuzu-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/hid')
| -rw-r--r-- | src/core/hle/service/hid/hid.cpp | 12 |
1 files changed, 6 insertions, 6 deletions
diff --git a/src/core/hle/service/hid/hid.cpp b/src/core/hle/service/hid/hid.cpp index 5255f6dc8..2014b8461 100644 --- a/src/core/hle/service/hid/hid.cpp +++ b/src/core/hle/service/hid/hid.cpp | |||
| @@ -253,12 +253,12 @@ void GetIPCHandles(Service::Interface* self) { | |||
| 253 | cmd_buff[1] = 0; // No error | 253 | cmd_buff[1] = 0; // No error |
| 254 | cmd_buff[2] = 0x14000000; // IPC Command Structure translate-header | 254 | cmd_buff[2] = 0x14000000; // IPC Command Structure translate-header |
| 255 | // TODO(yuriks): Return error from SendSyncRequest is this fails (part of IPC marshalling) | 255 | // TODO(yuriks): Return error from SendSyncRequest is this fails (part of IPC marshalling) |
| 256 | cmd_buff[3] = Kernel::g_handle_table.Create(Service::HID::shared_mem).MoveFrom(); | 256 | cmd_buff[3] = Kernel::g_handle_table.Create(Service::HID::shared_mem).Unwrap(); |
| 257 | cmd_buff[4] = Kernel::g_handle_table.Create(Service::HID::event_pad_or_touch_1).MoveFrom(); | 257 | cmd_buff[4] = Kernel::g_handle_table.Create(Service::HID::event_pad_or_touch_1).Unwrap(); |
| 258 | cmd_buff[5] = Kernel::g_handle_table.Create(Service::HID::event_pad_or_touch_2).MoveFrom(); | 258 | cmd_buff[5] = Kernel::g_handle_table.Create(Service::HID::event_pad_or_touch_2).Unwrap(); |
| 259 | cmd_buff[6] = Kernel::g_handle_table.Create(Service::HID::event_accelerometer).MoveFrom(); | 259 | cmd_buff[6] = Kernel::g_handle_table.Create(Service::HID::event_accelerometer).Unwrap(); |
| 260 | cmd_buff[7] = Kernel::g_handle_table.Create(Service::HID::event_gyroscope).MoveFrom(); | 260 | cmd_buff[7] = Kernel::g_handle_table.Create(Service::HID::event_gyroscope).Unwrap(); |
| 261 | cmd_buff[8] = Kernel::g_handle_table.Create(Service::HID::event_debug_pad).MoveFrom(); | 261 | cmd_buff[8] = Kernel::g_handle_table.Create(Service::HID::event_debug_pad).Unwrap(); |
| 262 | } | 262 | } |
| 263 | 263 | ||
| 264 | void EnableAccelerometer(Service::Interface* self) { | 264 | void EnableAccelerometer(Service::Interface* self) { |