X-Git-Url: https://git.sesse.net/?p=cubemap;a=blobdiff_plain;f=thread.cpp;fp=thread.cpp;h=d85be706ddf5e32003bad8105b1121edcf9ab315;hp=473c71a82110821745ce176b8d4259c77375d66a;hb=50651c954803c1941e6ad1bb494712891c18f7d2;hpb=f0621e41fdb96ce1bd58e7561e0aa76345072ba3

diff --git a/thread.cpp b/thread.cpp
index 473c71a..d85be70 100644
--- a/thread.cpp
+++ b/thread.cpp
@@ -7,14 +7,14 @@
 #include <unistd.h>
 
 #include "log.h"
-#include "mutexlock.h"
 #include "thread.h"
 
+using namespace std;
+
 Thread::~Thread() {}
 
 void Thread::run()
 {
-	pthread_mutex_init(&should_stop_mutex, nullptr);
 	should_stop_status = false;
 	pthread_create(&worker_thread, nullptr, &Thread::do_work_thunk, this);
 }
@@ -22,7 +22,7 @@ void Thread::run()
 void Thread::stop()
 {
 	{
-		MutexLock lock(&should_stop_mutex);
+		lock_guard<mutex> lock(should_stop_mutex);
 		should_stop_status = true;
 	}
 	wakeup();
@@ -92,6 +92,6 @@ void Thread::wakeup()
 
 bool Thread::should_stop()
 {
-	MutexLock lock(&should_stop_mutex);
+	lock_guard<mutex> lock(should_stop_mutex);
 	return should_stop_status;
 }