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 | b21dfbb2956698b05104bc68c0b08ade0d671fd8 (patch) | |
| tree | 2f39f319f1391d4be12e50d1504c2bfc06b35cc2 /src/core/hle/service/cam/cam.cpp | |
| parent | 96dcccc80ce16dbf60fc629d7659d6b9d19e27f0 (diff) | |
| parent | 723dc644faa6e29250d1b7fa914dfb7c75d8aec5 (diff) | |
Merge pull request #2790 from yuriks/remove-movefrom
Remove ResultVal::MoveFrom
Diffstat (limited to 'src/core/hle/service/cam/cam.cpp')
| -rw-r--r-- | src/core/hle/service/cam/cam.cpp | 6 |
1 files changed, 3 insertions, 3 deletions
diff --git a/src/core/hle/service/cam/cam.cpp b/src/core/hle/service/cam/cam.cpp index 7394c844f..c9f9e9d95 100644 --- a/src/core/hle/service/cam/cam.cpp +++ b/src/core/hle/service/cam/cam.cpp @@ -347,7 +347,7 @@ void GetVsyncInterruptEvent(Service::Interface* self) { int port = *port_select.begin(); rb.Push(RESULT_SUCCESS); rb.PushCopyHandles( - Kernel::g_handle_table.Create(ports[port].vsync_interrupt_event).MoveFrom()); + Kernel::g_handle_table.Create(ports[port].vsync_interrupt_event).Unwrap()); } else { LOG_ERROR(Service_CAM, "invalid port_select=%u", port_select.m_val); rb.Push(ERROR_INVALID_ENUM_VALUE); @@ -366,7 +366,7 @@ void GetBufferErrorInterruptEvent(Service::Interface* self) { int port = *port_select.begin(); rb.Push(RESULT_SUCCESS); rb.PushCopyHandles( - Kernel::g_handle_table.Create(ports[port].buffer_error_interrupt_event).MoveFrom()); + Kernel::g_handle_table.Create(ports[port].buffer_error_interrupt_event).Unwrap()); } else { LOG_ERROR(Service_CAM, "invalid port_select=%u", port_select.m_val); rb.Push(ERROR_INVALID_ENUM_VALUE); @@ -400,7 +400,7 @@ void SetReceiving(Service::Interface* self) { } rb.Push(RESULT_SUCCESS); - rb.PushCopyHandles(Kernel::g_handle_table.Create(port.completion_event).MoveFrom()); + rb.PushCopyHandles(Kernel::g_handle_table.Create(port.completion_event).Unwrap()); } else { LOG_ERROR(Service_CAM, "invalid port_select=%u", port_select.m_val); rb.Push(ERROR_INVALID_ENUM_VALUE); |