@@ -28,37 +28,41 @@
 #ifndef _TASKTHREAD_H_
 #define _TASKTHREAD_H_
 
-#include "thread.h"
 #include "event.h"
 #include "taskmanager.h"
 
 #include <memory>
 #include <atomic>
+#include <thread>
 
 namespace cpptask
 {
 
 class Task;
 class TaskThreadPool;
-class TaskThread: public Thread
+class TaskThread
 {
 public:
     TaskThread(TaskThreadPool& threadPool, Semaphore& newTaskEvent);
     ~TaskThread();
 
-    virtual void Run();
-
     void Stop();
 
     TaskManager& GetTaskManager();
 
     TaskThread(const TaskThread&) = delete;
     TaskThread& operator=(const TaskThread&) = delete;
+
+private:
+
+    void Run();
+
 private:
     Event stopEvent;
     Semaphore& newTaskEvent;
     std::unique_ptr<TaskManager> manager;
     std::atomic<bool> done;
+    std::thread thread;
 };
 
 }
 
@@ -38,15 +38,19 @@ namespace cpptask
 
 inline TaskThread::TaskThread(TaskThreadPool& threadPool, Semaphore& newTaskEvent)
     : newTaskEvent(newTaskEvent)
+    , manager(new TaskManager(threadPool, newTaskEvent, this))
+    , done(false)
+    , thread(std::bind(&TaskThread::Run, this))
 {
-    manager.reset(new TaskManager(threadPool, newTaskEvent, this));
-    done.store(false, std::memory_order_relaxed);
 }
 
 inline TaskThread::~TaskThread()
 {
     Stop();
-    Join();
+    if (thread.joinable())
+    {
+        thread.join();
+    }
 }
 
 inline void TaskThread::Run()
 
@@ -51,11 +51,6 @@ class TaskThreadPool
             TaskThreadPtr tptr(new TaskThread(*this, newTaskEvent));
             threads.push_back(tptr);
         }
-
-        for (size_t i = 0; i < threadsNum; ++i)
-        {
-            threads[i]->Start();
-        }
     }
 
     ~TaskThreadPool()
@@ -65,7 +60,6 @@ class TaskThreadPool
         for (;i != e; ++i)
         {
             (*i)->Stop();
-            (*i)->Join();
         }
     }
Original file line number	Diff line number	Diff line change
`@@ -38,15 +38,19 @@ namespace cpptask`
`38`	`38`
`39`	`39`	`inline TaskThread::TaskThread(TaskThreadPool& threadPool, Semaphore& newTaskEvent)`
`40`	`40`	`: newTaskEvent(newTaskEvent)`
	`41`	`+ , manager(new TaskManager(threadPool, newTaskEvent, this))`
	`42`	`+ , done(false)`
	`43`	`+ , thread(std::bind(&TaskThread::Run, this))`
`41`	`44`	`{`
`42`		`- manager.reset(new TaskManager(threadPool, newTaskEvent, this));`
`43`		`- done.store(false, std::memory_order_relaxed);`
`44`	`45`	`}`
`45`	`46`
`46`	`47`	`inline TaskThread::~TaskThread()`
`47`	`48`	`{`
`48`	`49`	`Stop();`
`49`		`- Join();`
	`50`	`+ if (thread.joinable())`
	`51`	`+ {`
	`52`	`+ thread.join();`
	`53`	`+ }`
`50`	`54`	`}`
`51`	`55`
`52`	`56`	`inline void TaskThread::Run()`
Original file line number	Diff line number	Diff line change
`@@ -51,11 +51,6 @@ class TaskThreadPool`
`51`	`51`	`TaskThreadPtr tptr(new TaskThread(*this, newTaskEvent));`
`52`	`52`	`threads.push_back(tptr);`
`53`	`53`	`}`
`54`		`-`
`55`		`- for (size_t i = 0; i < threadsNum; ++i)`
`56`		`- {`
`57`		`- threads[i]->Start();`
`58`		`- }`
`59`	`54`	`}`
`60`	`55`
`61`	`56`	`~TaskThreadPool()`
`@@ -65,7 +60,6 @@ class TaskThreadPool`
`65`	`60`	`for (;i != e; ++i)`
`66`	`61`	`{`
`67`	`62`	`(*i)->Stop();`
`68`		`- (*i)->Join();`
`69`	`63`	`}`
`70`	`64`	`}`
`71`	`65`