aboutsummaryrefslogtreecommitdiffhomepage
path: root/src/core/hle/service/srv.cpp
diff options
context:
space:
mode:
authorGravatar bunnei <ericbunnie@gmail.com>2014-06-06 00:35:49 -0400
committerGravatar bunnei <ericbunnie@gmail.com>2014-06-13 09:51:13 -0400
commitc95972275e276abe3afcac79d956ea29a0879c8e (patch)
treef902b895aa25142f94001674baedfdac9794d548 /src/core/hle/service/srv.cpp
parent5365ca157d5cb81c5cba3922036839f3c58e85ba (diff)
HLE: Updated all uses of NULL to nullptr (to be C++11 compliant)
Diffstat (limited to 'src/core/hle/service/srv.cpp')
-rw-r--r--src/core/hle/service/srv.cpp8
1 files changed, 4 insertions, 4 deletions
diff --git a/src/core/hle/service/srv.cpp b/src/core/hle/service/srv.cpp
index 07e2009a..f45c0efc 100644
--- a/src/core/hle/service/srv.cpp
+++ b/src/core/hle/service/srv.cpp
@@ -26,7 +26,7 @@ void GetProcSemaphore(Service::Interface* self) {
// Get process semaphore?
u32* cmd_buff = Service::GetCommandBuffer();
cmd_buff[1] = 0; // No error
- cmd_buff[3] = g_mutex; // Return something... 0 == NULL, raises an exception
+ cmd_buff[3] = g_mutex; // Return something... 0 == nullptr, raises an exception
}
void GetServiceHandle(Service::Interface* self) {
@@ -36,7 +36,7 @@ void GetServiceHandle(Service::Interface* self) {
std::string port_name = std::string((const char*)&cmd_buff[1], 0, Service::kMaxPortSize);
Service::Interface* service = Service::g_manager->FetchFromPortName(port_name);
- if (NULL != service) {
+ if (nullptr != service) {
cmd_buff[3] = service->GetHandle();
DEBUG_LOG(OSHLE, "called port=%s, handle=0x%08X", port_name.c_str(), cmd_buff[3]);
} else {
@@ -49,8 +49,8 @@ void GetServiceHandle(Service::Interface* self) {
const Interface::FunctionInfo FunctionTable[] = {
{0x00010002, Initialize, "Initialize"},
{0x00020000, GetProcSemaphore, "GetProcSemaphore"},
- {0x00030100, NULL, "RegisterService"},
- {0x000400C0, NULL, "UnregisterService"},
+ {0x00030100, nullptr, "RegisterService"},
+ {0x000400C0, nullptr, "UnregisterService"},
{0x00050100, GetServiceHandle, "GetServiceHandle"},
};