From c95972275e276abe3afcac79d956ea29a0879c8e Mon Sep 17 00:00:00 2001
From: bunnei <ericbunnie@gmail.com>
Date: Fri, 6 Jun 2014 00:35:49 -0400
Subject: HLE: Updated all uses of NULL to nullptr (to be C++11 compliant)

---
 src/core/hle/kernel/kernel.cpp |  2 +-
 src/core/hle/kernel/mutex.cpp  |  2 +-
 src/core/hle/kernel/thread.cpp | 14 +++++++-------
 3 files changed, 9 insertions(+), 9 deletions(-)

(limited to 'src/core/hle/kernel')

diff --git a/src/core/hle/kernel/kernel.cpp b/src/core/hle/kernel/kernel.cpp
index 9d5991c37..e51a9d45a 100644
--- a/src/core/hle/kernel/kernel.cpp
+++ b/src/core/hle/kernel/kernel.cpp
@@ -128,7 +128,7 @@ Object* ObjectPool::CreateByIDType(int type) {
 
     default:
         ERROR_LOG(COMMON, "Unable to load state: could not find object type %d.", type);
-        return NULL;
+        return nullptr;
     }
 }
 
diff --git a/src/core/hle/kernel/mutex.cpp b/src/core/hle/kernel/mutex.cpp
index a76c8de03..1ccf1eb73 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 != NULL), "ReleaseMutex tried to release a NULL mutex!");
+    _assert_msg_(KERNEL, (mutex != nullptr), "ReleaseMutex tried to release a nullptr mutex!");
 
     if (!ReleaseMutex(mutex)) {
         return -1;
diff --git a/src/core/hle/kernel/thread.cpp b/src/core/hle/kernel/thread.cpp
index 5fdb4fbe6..700f4ea7c 100644
--- a/src/core/hle/kernel/thread.cpp
+++ b/src/core/hle/kernel/thread.cpp
@@ -223,7 +223,7 @@ void SwitchContext(Thread* t) {
         t->wait_type = WAITTYPE_NONE;
         LoadContext(t->context);
     } else {
-        SetCurrentThread(NULL);
+        SetCurrentThread(nullptr);
     }
 }
 
@@ -238,7 +238,7 @@ Thread* NextThread() {
         next = g_thread_ready_queue.pop_first();
     }
     if (next == 0) {
-        return NULL;
+        return nullptr;
     }
     return Kernel::g_object_pool.GetFast<Thread>(next);
 }
@@ -312,8 +312,8 @@ Thread* CreateThread(Handle& handle, const char* name, u32 entry_point, s32 prio
 Handle CreateThread(const char* name, u32 entry_point, s32 priority, u32 arg, s32 processor_id,
     u32 stack_top, int stack_size) {
 
-    if (name == NULL) {
-        ERROR_LOG(KERNEL, "CreateThread(): NULL name");
+    if (name == nullptr) {
+        ERROR_LOG(KERNEL, "CreateThread(): nullptr name");
         return -1;
     }
     if ((u32)stack_size < 0x200) {
@@ -353,19 +353,19 @@ 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 != NULL), "called, but thread is NULL!");
+    _assert_msg_(KERNEL, (thread != nullptr), "called, but thread is nullptr!");
     return thread->current_priority;
 }
 
 /// Set the priority of the thread specified by handle
 Result SetThreadPriority(Handle handle, s32 priority) {
-    Thread* thread = NULL;
+    Thread* thread = nullptr;
     if (!handle) {
         thread = GetCurrentThread(); // TODO(bunnei): Is this correct behavior?
     } else {
         thread = g_object_pool.GetFast<Thread>(handle);
     }
-    _assert_msg_(KERNEL, (thread != NULL), "called, but thread is NULL!");
+    _assert_msg_(KERNEL, (thread != nullptr), "called, but thread is nullptr!");
 
     // If priority is invalid, clamp to valid range
     if (priority < THREADPRIO_HIGHEST || priority > THREADPRIO_LOWEST) {
-- 
cgit v1.2.3