C++11 cleanup on constructors (#6000)

[dragonfireclient.git] / src / threading / thread.cpp

diff --git a/src/threading/thread.cpp b/src/threading/thread.cpp
index cc4d65656f6dae7dc68f490917d2c730f17cbf55..8f54fb76286669838c74c7c326d3c1ea1633bcf0 100644 (file)
--- a/src/threading/thread.cpp
+++ b/src/threading/thread.cpp
@@ -60,8 +60,6 @@ DEALINGS IN THE SOFTWARE.
 
 Thread::Thread(const std::string &name) :
        m_name(name),
-       m_retval(NULL),
-       m_joinable(false),
        m_request_stop(false),
        m_running(false)
 {
@@ -130,7 +128,7 @@ bool Thread::wait()
        m_thread_obj->join();
 
        delete m_thread_obj;
-       m_thread_obj = NULL;
+       m_thread_obj = nullptr;
 
        assert(m_running == false);
        m_joinable = false;
@@ -162,7 +160,7 @@ bool Thread::kill()
        wait();
 #endif
 
-       m_retval       = NULL;
+       m_retval       = nullptr;
        m_joinable     = false;
        m_request_stop = false;