From 9e83411f7e4147d09af5a5006888dcc187ea0ef8 Mon Sep 17 00:00:00 2001
From: Andrei Karas <akaras@inbox.ru>
Date: Mon, 7 Nov 2011 19:34:52 +0300
Subject: Fix some warnings under gcc 4.7.

---
 src/net/tmwa/messagehandler.cpp | 2 +-
 src/net/tmwa/network.cpp        | 4 ++--
 2 files changed, 3 insertions(+), 3 deletions(-)

(limited to 'src/net/tmwa')

diff --git a/src/net/tmwa/messagehandler.cpp b/src/net/tmwa/messagehandler.cpp
index 843339718..830b3bc4f 100644
--- a/src/net/tmwa/messagehandler.cpp
+++ b/src/net/tmwa/messagehandler.cpp
@@ -32,7 +32,7 @@ namespace TmwAthena
 {
 
 MessageHandler::MessageHandler()
-    : mNetwork(NULL)
+    : mNetwork(nullptr)
 {
 }
 
diff --git a/src/net/tmwa/network.cpp b/src/net/tmwa/network.cpp
index e26f48324..6f26035be 100644
--- a/src/net/tmwa/network.cpp
+++ b/src/net/tmwa/network.cpp
@@ -181,8 +181,8 @@ void Network::disconnect()
 
     if (mWorkerThread && SDL_GetThreadID(mWorkerThread))
     {
-        SDL_WaitThread(mWorkerThread, NULL);
-        mWorkerThread = NULL;
+        SDL_WaitThread(mWorkerThread, nullptr);
+        mWorkerThread = nullptr;
     }
 
     if (mSocket)
-- 
cgit v1.2.3-70-g09d2