Remove pending_task struct

Author: gilzoide

CMakeLists.txt

@@ -25,8 +25,11 @@ endif()
 set(_DISPATCH_QUEUE_HEADERS
   "include/dispatch_queue.hpp"
   "include/function_result.hpp"
-  "include/pending_task.hpp"
+  "include/is_instance_of.hpp"
   "include/pending_task_queue.hpp"
+  "include/promise.hpp"
+  "include/task_future.hpp"
+  "include/task.hpp"
   "include/worker_pool.hpp"
 )
 

include/pending_task.hpp

@@ -2,13 +2,12 @@
 
 #include <deque>
 
-#include "pending_task.hpp"
-
-
 namespace dispatch_queue {
 
 namespace detail {
 
+using pending_task = std::function<void()>;
+
 class pending_task_queue {
 public:
 	bool empty() const;

include/pending_task_queue.hpp

@@ -5,7 +5,6 @@
 #include <mutex>
 #include <thread>
 
-#include "pending_task.hpp"
 #include "pending_task_queue.hpp"
 
 

include/worker_pool.hpp

@@ -49,11 +49,11 @@ void dispatch_queue::clear() {
 }
 
 void dispatch_queue::main_loop() {
-	std::deque<pending_task> main_loop_tasks = worker_pool
+	std::deque<detail::pending_task> main_loop_tasks = worker_pool
 		? worker_pool->pop_main_loop_tasks()
 		: task_queue.pop_main_loop_tasks();
 	for (auto&& it : main_loop_tasks) {
-		it.work();
+		it();
 	}
 }
 

src/dispatch_queue.cpp

@@ -74,7 +74,7 @@ void worker_pool::run_task_loop() {
 		}
 
 		// 2. Do some work
-		task.work();
+		task();
 
 		// 3. If all is done, notify waiters
 		bool all_done;