luanti-org/luanti
1
0
Fork 0
mirror of https://github.com/luanti-org/luanti.git synced 2025-10-13 16:45:20 +02:00
Code Activity

C++11 cleanup on constructors (#6000)

Browse Source 
* C++11 cleanup on constructors dir script
This commit is contained in:
Vincent Glize
2017-06-19 23:54:58 +02:00
committed by Loïc Blot
parent 4a78949083
commit 4a5e8ad343
40 changed files with 117 additions and 180 deletions
Download Patch File Download Diff File Expand all files Collapse all files

6
src/threading/thread.cpp
View File

@@ -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;

4
src/threading/thread.h
View File

@@ -145,8 +145,8 @@ private:
static void threadProc(Thread *thr);
void *m_retval;
bool m_joinable;
void *m_retval = nullptr;
bool m_joinable = false;
std::atomic<bool> m_request_stop;
std::atomic<bool> m_running;
std::mutex m_mutex;