diff options
author | bunnei <ericbunnie@gmail.com> | 2014-06-06 06:19:40 +0200 |
---|---|---|
committer | bunnei <ericbunnie@gmail.com> | 2014-06-13 15:51:11 +0200 |
commit | d7363322c79d6e7598e0d80cf1af9c05b652cecb (patch) | |
tree | 162a31d1cda9cada208f3732a7f76317d891a0f2 /src/core/hle/kernel | |
parent | Mutex: Moved ReleaseMutex iterator declaration to be inside while loop. (diff) | |
download | yuzu-d7363322c79d6e7598e0d80cf1af9c05b652cecb.tar yuzu-d7363322c79d6e7598e0d80cf1af9c05b652cecb.tar.gz yuzu-d7363322c79d6e7598e0d80cf1af9c05b652cecb.tar.bz2 yuzu-d7363322c79d6e7598e0d80cf1af9c05b652cecb.tar.lz yuzu-d7363322c79d6e7598e0d80cf1af9c05b652cecb.tar.xz yuzu-d7363322c79d6e7598e0d80cf1af9c05b652cecb.tar.zst yuzu-d7363322c79d6e7598e0d80cf1af9c05b652cecb.zip |
Diffstat (limited to '')
-rw-r--r-- | src/core/hle/kernel/mutex.cpp | 2 | ||||
-rw-r--r-- | src/core/hle/kernel/thread.cpp | 4 |
2 files changed, 3 insertions, 3 deletions
diff --git a/src/core/hle/kernel/mutex.cpp b/src/core/hle/kernel/mutex.cpp index eee7c4935..ee7507edf 100644 --- a/src/core/hle/kernel/mutex.cpp +++ b/src/core/hle/kernel/mutex.cpp @@ -122,7 +122,7 @@ bool ReleaseMutex(Mutex* mutex) { Result ReleaseMutex(Handle handle) { Mutex* mutex = Kernel::g_object_pool.GetFast<Mutex>(handle); - _assert_msg_(KERNEL, mutex, "ReleaseMutex tried to release a NULL mutex!"); + _assert_msg_(KERNEL, (mutex != NULL), "ReleaseMutex tried to release a NULL mutex!"); if (!ReleaseMutex(mutex)) { return -1; diff --git a/src/core/hle/kernel/thread.cpp b/src/core/hle/kernel/thread.cpp index da93e006c..5fdb4fbe6 100644 --- a/src/core/hle/kernel/thread.cpp +++ b/src/core/hle/kernel/thread.cpp @@ -353,7 +353,7 @@ Handle CreateThread(const char* name, u32 entry_point, s32 priority, u32 arg, s3 /// Get the priority of the thread specified by handle u32 GetThreadPriority(const Handle handle) { Thread* thread = g_object_pool.GetFast<Thread>(handle); - _assert_msg_(KERNEL, thread, "called, but thread is NULL!"); + _assert_msg_(KERNEL, (thread != NULL), "called, but thread is NULL!"); return thread->current_priority; } @@ -365,7 +365,7 @@ Result SetThreadPriority(Handle handle, s32 priority) { } else { thread = g_object_pool.GetFast<Thread>(handle); } - _assert_msg_(KERNEL, thread, "called, but thread is NULL!"); + _assert_msg_(KERNEL, (thread != NULL), "called, but thread is NULL!"); // If priority is invalid, clamp to valid range if (priority < THREADPRIO_HIGHEST || priority > THREADPRIO_LOWEST) { |