diff options
| author | Tillmann Karras <tilkax@gmail.com> | 2014-03-09 21:14:26 +0100 |
|---|---|---|
| committer | Tillmann Karras <tilkax@gmail.com> | 2014-03-09 21:14:26 +0100 |
| commit | d802d392811be44d34ae9cd23f616db93e54c50f (patch) | |
| tree | f9aa8831a0731ea246bd921d979f4bffa7f07bd0 /Source/Core/Common/StdThread.h | |
| parent | f28116b7da6aac6069084596dc4dbf866bdebfd8 (diff) | |
clang-modernize -use-nullptr
and s/\bNULL\b/nullptr/g for *.cpp/h/mm files not compiled on my machine
Diffstat (limited to 'Source/Core/Common/StdThread.h')
| -rw-r--r-- | Source/Core/Common/StdThread.h | 6 |
1 files changed, 3 insertions, 3 deletions
diff --git a/Source/Core/Common/StdThread.h b/Source/Core/Common/StdThread.h index 8b8357fd89..787f25a167 100644 --- a/Source/Core/Common/StdThread.h +++ b/Source/Core/Common/StdThread.h @@ -193,7 +193,7 @@ public: WaitForSingleObject(m_handle, INFINITE); detach(); #else - pthread_join(m_id.m_thread, NULL); + pthread_join(m_id.m_thread, nullptr); m_id = id(); #endif } @@ -238,9 +238,9 @@ private: void StartThread(F* param) { #ifdef USE_BEGINTHREADEX - m_handle = (HANDLE)_beginthreadex(NULL, 0, &RunAndDelete<F>, param, 0, &m_id.m_thread); + m_handle = (HANDLE)_beginthreadex(nullptr, 0, &RunAndDelete<F>, param, 0, &m_id.m_thread); #elif defined(_WIN32) - m_handle = CreateThread(NULL, 0, &RunAndDelete<F>, param, 0, &m_id.m_thread); + m_handle = CreateThread(nullptr, 0, &RunAndDelete<F>, param, 0, &m_id.m_thread); #else pthread_attr_t attr; pthread_attr_init(&attr); |