diff options
| author | 2015-05-29 15:09:26 -0700 | |
|---|---|---|
| committer | 2015-05-29 15:09:26 -0700 | |
| commit | a489a846563fc64f236c7ede69ce0eb34af3521a (patch) | |
| tree | 706e345043532d90cd8ca5c41af67fc31dfa7d2e /src/core/hle/svc.cpp | |
| parent | Merge pull request #817 from linkmauve/citra.ico (diff) | |
| parent | Travis: Add a check for trailing whitespace before any actual compilation. (diff) | |
| download | yuzu-a489a846563fc64f236c7ede69ce0eb34af3521a.tar.gz yuzu-a489a846563fc64f236c7ede69ce0eb34af3521a.tar.xz yuzu-a489a846563fc64f236c7ede69ce0eb34af3521a.zip | |
Merge pull request #818 from linkmauve/no-trailing-whitespace
Ban trailing whitespace from the entire project, forever
Diffstat (limited to 'src/core/hle/svc.cpp')
| -rw-r--r-- | src/core/hle/svc.cpp | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/src/core/hle/svc.cpp b/src/core/hle/svc.cpp index ca3ff3328..d1555c753 100644 --- a/src/core/hle/svc.cpp +++ b/src/core/hle/svc.cpp | |||
| @@ -228,7 +228,7 @@ static ResultCode WaitSynchronizationN(s32* out, Handle* handles, s32 handle_cou | |||
| 228 | // Actually wait the current thread on each object if we decided to wait... | 228 | // Actually wait the current thread on each object if we decided to wait... |
| 229 | std::vector<SharedPtr<Kernel::WaitObject>> wait_objects; | 229 | std::vector<SharedPtr<Kernel::WaitObject>> wait_objects; |
| 230 | wait_objects.reserve(handle_count); | 230 | wait_objects.reserve(handle_count); |
| 231 | 231 | ||
| 232 | for (int i = 0; i < handle_count; ++i) { | 232 | for (int i = 0; i < handle_count; ++i) { |
| 233 | auto object = Kernel::g_handle_table.GetWaitObject(handles[i]); | 233 | auto object = Kernel::g_handle_table.GetWaitObject(handles[i]); |
| 234 | object->AddWaitingThread(Kernel::GetCurrentThread()); | 234 | object->AddWaitingThread(Kernel::GetCurrentThread()); |
| @@ -475,7 +475,7 @@ static ResultCode GetProcessIdOfThread(u32* process_id, Handle thread_handle) { | |||
| 475 | return ERR_INVALID_HANDLE; | 475 | return ERR_INVALID_HANDLE; |
| 476 | 476 | ||
| 477 | const SharedPtr<Kernel::Process> process = thread->owner_process; | 477 | const SharedPtr<Kernel::Process> process = thread->owner_process; |
| 478 | 478 | ||
| 479 | ASSERT_MSG(process != nullptr, "Invalid parent process for thread=0x%08X", thread_handle); | 479 | ASSERT_MSG(process != nullptr, "Invalid parent process for thread=0x%08X", thread_handle); |
| 480 | 480 | ||
| 481 | *process_id = process->process_id; | 481 | *process_id = process->process_id; |