aboutsummaryrefslogtreecommitdiffhomepage
path: root/src/core/hle/service/service.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/service.cpp
parent5365ca157d5cb81c5cba3922036839f3c58e85ba (diff)
HLE: Updated all uses of NULL to nullptr (to be C++11 compliant)
Diffstat (limited to 'src/core/hle/service/service.cpp')
-rw-r--r--src/core/hle/service/service.cpp4
1 files changed, 2 insertions, 2 deletions
diff --git a/src/core/hle/service/service.cpp b/src/core/hle/service/service.cpp
index 781b41fb..4a1ac857 100644
--- a/src/core/hle/service/service.cpp
+++ b/src/core/hle/service/service.cpp
@@ -19,7 +19,7 @@
namespace Service {
-Manager* g_manager = NULL; ///< Service manager
+Manager* g_manager = nullptr; ///< Service manager
////////////////////////////////////////////////////////////////////////////////////////////////////
// Service Manager class
@@ -56,7 +56,7 @@ Interface* Manager::FetchFromHandle(Handle handle) {
Interface* Manager::FetchFromPortName(std::string port_name) {
auto itr = m_port_map.find(port_name);
if (itr == m_port_map.end()) {
- return NULL;
+ return nullptr;
}
return FetchFromHandle(itr->second);
}