NULL -> nullptr

8 files changed, 40 insertions, 40 deletions

diff --git a/fnet/src/examples/frt/rpc/rpc_info.cpp b/fnet/src/examples/frt/rpc/rpc_info.cpp
index af15a19b6a4..600af612b40 100644
--- a/fnet/src/examples/frt/rpc/rpc_info.cpp
+++ b/fnet/src/examples/frt/rpc/rpc_info.cpp
@@ -10,16 +10,16 @@ public:
 
     void GetReq(FRT_RPCRequest **req, FRT_Supervisor *supervisor)
     {
-        if ((*req) != NULL)
+        if ((*req) != nullptr)
             (*req)->SubRef();
         (*req) = supervisor->AllocRPCRequest();
     }
 
     void FreeReqs(FRT_RPCRequest *r1, FRT_RPCRequest *r2)
     {
-        if (r1 != NULL)
+        if (r1 != nullptr)
             r1->SubRef();
-        if (r2 != NULL)
+        if (r2 != nullptr)
             r2->SubRef();
     }
 
@@ -79,8 +79,8 @@ RPCInfo::Main()
     bool verbose = (_argc > 2 && strcmp(_argv[2], "verbose") == 0);
     FRT_Supervisor supervisor;
     FRT_Target     *target = supervisor.GetTarget(_argv[1]);
-    FRT_RPCRequest *m_list = NULL;
-    FRT_RPCRequest *info   = NULL;
+    FRT_RPCRequest *m_list = nullptr;
+    FRT_RPCRequest *info   = nullptr;
     supervisor.Start();
 
     GetReq(&info, &supervisor);
diff --git a/fnet/src/examples/frt/rpc/rpc_invoke.cpp b/fnet/src/examples/frt/rpc/rpc_invoke.cpp
index d7dc6b86b77..0295e7ea7a9 100644
--- a/fnet/src/examples/frt/rpc/rpc_invoke.cpp
+++ b/fnet/src/examples/frt/rpc/rpc_invoke.cpp
@@ -15,22 +15,22 @@ private:
         const char *value = param + 2;
         switch (param[0]) {
         case 'b':
-            req->GetParams()->AddInt8(strtoll(value, NULL, 0));
+            req->GetParams()->AddInt8(strtoll(value, nullptr, 0));
             break;
         case 'h':
-            req->GetParams()->AddInt16(strtoll(value, NULL, 0));
+            req->GetParams()->AddInt16(strtoll(value, nullptr, 0));
             break;
         case 'i':
-            req->GetParams()->AddInt32(strtoll(value, NULL, 0));
+            req->GetParams()->AddInt32(strtoll(value, nullptr, 0));
             break;
         case 'l':
-            req->GetParams()->AddInt64(strtoll(value, NULL, 0));
+            req->GetParams()->AddInt64(strtoll(value, nullptr, 0));
             break;
         case 'f':
-            req->GetParams()->AddFloat(strtod(value, NULL));
+            req->GetParams()->AddFloat(strtod(value, nullptr));
             break;
         case 'd':
-            req->GetParams()->AddDouble(strtod(value, NULL));
+            req->GetParams()->AddDouble(strtod(value, nullptr));
             break;
         case 's':
             req->GetParams()->AddString(value);
diff --git a/fnet/src/examples/frt/rpc/rpc_proxy.cpp b/fnet/src/examples/frt/rpc/rpc_proxy.cpp
index 19c59f9201d..af01ac60d26 100644
--- a/fnet/src/examples/frt/rpc/rpc_proxy.cpp
+++ b/fnet/src/examples/frt/rpc/rpc_proxy.cpp
@@ -13,8 +13,8 @@ struct Session
     uint32_t         id;
     uint32_t         finiCnt;
 
-    Session(uint32_t xid) : client(NULL), server(NULL), id(xid), finiCnt(0) {}
-    ~Session() { assert(client == NULL && server == NULL && finiCnt == 2); }
+    Session(uint32_t xid) : client(nullptr), server(nullptr), id(xid), finiCnt(0) {}
+    ~Session() { assert(client == nullptr && server == nullptr && finiCnt == 2); }
 
 private:
     Session(const Session &);
@@ -93,7 +93,7 @@ RPCProxy::GetPrefix(FRT_RPCRequest *req)
     (void) currTimePt;
 
     char rid[32];
-    if (req->GetContext()._value.CHANNEL != NULL) {
+    if (req->GetContext()._value.CHANNEL != nullptr) {
         sprintf(rid, "[rid=%u]", req->GetContext()._value.CHANNEL->GetID());
     } else {
         rid[0] = '\0';
@@ -142,10 +142,10 @@ RPCProxy::HOOK_Mismatch(FRT_RPCRequest *req)
     }
     req->Detach();
     req->SetError(FRTE_NO_ERROR, "");
-    if (req->GetConnection()->IsServer() && GetSession(req)->server != NULL)
+    if (req->GetConnection()->IsServer() && GetSession(req)->server != nullptr)
     {
         GetSession(req)->server->InvokeAsync(req, 60.0, &req->getStash().create<ReqDone>(*this));
-    } else if (req->GetConnection()->IsClient() && GetSession(req)->client != NULL)
+    } else if (req->GetConnection()->IsClient() && GetSession(req)->client != nullptr)
     {
         FRT_Supervisor::InvokeAsync(GetSession(req)->client->Owner(), GetSession(req)->client,
                                     req, 60.0, &req->getStash().create<ReqDone>(*this));
@@ -168,7 +168,7 @@ RPCProxy::HOOK_Init(FRT_RPCRequest *req)
         _supervisor.Get2WayTarget(_spec,
                                   FNET_Context((void *) session));
     session->client->SetContext(FNET_Context((void *) session));
-    if (session->server->GetConnection() == NULL ||
+    if (session->server->GetConnection() == nullptr ||
         session->server->GetConnection()->GetState()
         > FNET_Connection::FNET_CONNECTED)
     {
@@ -184,13 +184,13 @@ RPCProxy::HOOK_Down(FRT_RPCRequest *req)
 {
     Session *session = GetSession(req);
     if (req->GetConnection()->IsClient()) {
-        if (session->client != NULL) {
+        if (session->client != nullptr) {
             session->client->Owner()->Close(session->client);
         }
     } else {
         session->server->SubRef();
-        session->client = NULL;
-        session->server = NULL;
+        session->client = nullptr;
+        session->server = nullptr;
     }
 }
 
diff --git a/fnet/src/examples/frt/rpc/rpc_server.cpp b/fnet/src/examples/frt/rpc/rpc_server.cpp
index 5e8dd744fdc..4da65ddfe2b 100644
--- a/fnet/src/examples/frt/rpc/rpc_server.cpp
+++ b/fnet/src/examples/frt/rpc/rpc_server.cpp
@@ -14,7 +14,7 @@ private:
     RPCServer &operator=(const RPCServer &);
 
 public:
-    RPCServer() : _supervisor(NULL) {}
+    RPCServer() : _supervisor(nullptr) {}
     void InitRPC(FRT_Supervisor *s);
     void RPC_concat(FRT_RPCRequest *req);
     void RPC_addFloat(FRT_RPCRequest *req);
diff --git a/fnet/src/examples/ping/packets.cpp b/fnet/src/examples/ping/packets.cpp
index 8958666b374..f7b50f5d898 100644
--- a/fnet/src/examples/ping/packets.cpp
+++ b/fnet/src/examples/ping/packets.cpp
@@ -61,5 +61,5 @@ PingPacketFactory::CreatePacket(uint32_t pcode, FNET_Context)
     case PCODE_PING_REQUEST: return new PingRequest();
     case PCODE_PING_REPLY:   return new PingReply();
     }
-    return NULL;
+    return nullptr;
 }
diff --git a/fnet/src/examples/ping/pingclient.cpp b/fnet/src/examples/ping/pingclient.cpp
index 075c0b5df32..2f11adb73e5 100644
--- a/fnet/src/examples/ping/pingclient.cpp
+++ b/fnet/src/examples/ping/pingclient.cpp
@@ -33,7 +33,7 @@ PingClient::Main()
 
     uint32_t channelCnt = 0;
     for (uint32_t i = 0; i < 10; i++) {
-        channels[i] = (conn == NULL) ? NULL : conn->OpenChannel(&queue, FNET_Context(i));
+        channels[i] = (conn == nullptr) ? nullptr : conn->OpenChannel(&queue, FNET_Context(i));
         if (channels[i] == 0) {
             fprintf(stderr, "Could not make channel[%d] to %s\n", i, _argv[1]);
             break;
@@ -48,13 +48,13 @@ PingClient::Main()
     FNET_Context  context;
     while (channelCnt > 0) {
         packet = queue.DequeuePacket(5000, &context);
-        if (packet == NULL) {
+        if (packet == nullptr) {
             fprintf(stderr, "Timeout\n");
             for(int c = 0; c < 10; c++) {
-                if (channels[c] != NULL) {
+                if (channels[c] != nullptr) {
                     channels[c]->Close();
                     channels[c]->Free();
-                    channels[c] = NULL;
+                    channels[c] = nullptr;
                     fprintf(stderr, "Closed channel with context %d\n", c);
                 }
             }
@@ -67,17 +67,17 @@ PingClient::Main()
             fprintf(stderr, "Lost channel with context %d\n",
                     context._value.INT);
         }
-        if (channels[context._value.INT] != NULL) {
+        if (channels[context._value.INT] != nullptr) {
             channels[context._value.INT]->Close();
             channels[context._value.INT]->Free();
-            channels[context._value.INT] = NULL;
+            channels[context._value.INT] = nullptr;
             fprintf(stderr, "Closed channel with context %d\n",
                     context._value.INT);
             channelCnt--;
         }
         packet->Free();
     }
-    if (conn != NULL)
+    if (conn != nullptr)
         conn->SubRef();
     transport.ShutDown(true);
     pool.Close();
diff --git a/fnet/src/examples/ping/pingserver.cpp b/fnet/src/examples/ping/pingserver.cpp
index 346307a017c..905a1dc656d 100644
--- a/fnet/src/examples/ping/pingserver.cpp
+++ b/fnet/src/examples/ping/pingserver.cpp
@@ -48,7 +48,7 @@ PingServer::Main()
     FNET_SimplePacketStreamer  streamer(&factory);
     FNET_Connector *listener =
         transport.Listen(_argv[1], &streamer, this);
-    if (listener != NULL)
+    if (listener != nullptr)
         listener->SubRef();
 
     FNET_SignalShutDown ssd(transport);
diff --git a/fnet/src/examples/proxy/proxy.cpp b/fnet/src/examples/proxy/proxy.cpp
index 9a76077591f..243c1e764c1 100644
--- a/fnet/src/examples/proxy/proxy.cpp
+++ b/fnet/src/examples/proxy/proxy.cpp
@@ -55,7 +55,7 @@ private:
     Bridge &operator=(const Bridge &);
 
 public:
-    Bridge() : _client(NULL), _server(NULL) {}
+    Bridge() : _client(nullptr), _server(nullptr) {}
 
     enum packet_source {
         CLIENT = 0,
@@ -83,37 +83,37 @@ Bridge::HandlePacket(FNET_Packet *packet, FNET_Context context)
 
         if (context._value.INT == CLIENT) {
 
-            if (_server != NULL) {
+            if (_server != nullptr) {
                 LOG(info, "client connection lost");
                 _server->Owner()->Close(_server);
             }
             ret = FNET_FREE_CHANNEL;
-            _client = NULL;
+            _client = nullptr;
 
         } else if (context._value.INT == SERVER) {
 
-            if (_client != NULL) {
+            if (_client != nullptr) {
                 LOG(info, "server connection lost");
                 _client->GetConnection()->Owner()->Close(_client->GetConnection());
             }
             _server->SubRef();
-            _server = NULL;
+            _server = nullptr;
 
         }
 
-        if (_client == NULL && _server == NULL)
+        if (_client == nullptr && _server == nullptr)
             delete this;
 
     } else {
 
         if (context._value.INT == CLIENT) {
-            if (_server != NULL)
+            if (_server != nullptr)
                 _server->PostPacket(packet, FNET_NOID);
             else
                 packet->Free();
 
         } else if (context._value.INT == SERVER) {
-            if (_client != NULL)
+            if (_client != nullptr)
                 _client->Send(packet);
             else
                 packet->Free();
@@ -196,7 +196,7 @@ Proxy::InitAdminChannel(FNET_Channel *channel)
     Bridge *bridge = new Bridge();
     FNET_Connection *server = _transport.Connect(_argv[2], this, bridge,
                                                  FNET_Context(Bridge::SERVER));
-    if (server == NULL) {
+    if (server == nullptr) {
         channel->GetConnection()->Owner()->Close(channel->GetConnection());
         delete bridge;
         return false;
@@ -226,7 +226,7 @@ Proxy::Main()
 
     FNET_Connector *listener =
         _transport.Listen(_argv[1], this, this);
-    if (listener != NULL)
+    if (listener != nullptr)
         listener->SubRef();
 
     _transport.SetLogStats(true);