Use git diff instead of diff-index for setlocalversion.

[loba.git] / msg_thread.cpp

diff --git a/msg_thread.cpp b/msg_thread.cpp
index 35ee01a4268eeaf476fe631155d85d43df8b9b5d..309d5734e672430c5870cf6a270a20509ff7ca17 100644 (file)
--- a/msg_thread.cpp
+++ b/msg_thread.cpp
@@ -8,14 +8,14 @@ XBT_LOG_EXTERNAL_DEFAULT_CATEGORY(thrd);
 
 msg_thread::msg_thread()
     : started(false)
 
 msg_thread::msg_thread()
     : started(false)

-    , thread(NULL)
+    , thread(nullptr)

     , thread_name("msg_thread")
 {
 }
 
 msg_thread::msg_thread(const char* name)
     : started(false)
     , thread_name("msg_thread")
 {
 }
 
 msg_thread::msg_thread(const char* name)
     : started(false)

-    , thread(NULL)
+    , thread(nullptr)

     , thread_name(name)
 {
 }
     , thread_name(name)
 {
 }


@@ -61,7 +61,7 @@ int msg_thread::start_wrapper(int, char* [])
 
     XBT_DEBUG("terminate \"%s\"", self->thread_name.c_str());
     self->mutex.acquire();
 
     XBT_DEBUG("terminate \"%s\"", self->thread_name.c_str());
     self->mutex.acquire();

-    self->thread = NULL;
+    self->thread = nullptr;

     self->cond.signal();
     self->mutex.release();
     return 0;
     self->cond.signal();
     self->mutex.release();
     return 0;