diff --git a/include/lockfreequeue.h b/include/lockfreequeue.h index 48da772..78ae6dc 100644 --- a/include/lockfreequeue.h +++ b/include/lockfreequeue.h @@ -242,17 +242,17 @@ namespace task_scheduler { { } - virtual bool push_back(T newData) { return queue.push_back(newData); } + bool push_back(T newData) { return queue.push_back(newData); } - //virtual bool push_front(T newData) { return queue.push_front(newData); } + //bool push_front(T newData) { return queue.push_front(newData); } - virtual bool pop_front(T &val) { return queue.pop_front(val); } + bool pop_front(T &val) { return queue.pop_front(val); } - virtual bool pop_back(T &val) { return queue.pop_front(val); } + bool pop_back(T &val) { return queue.pop_front(val); } - virtual bool empty() const { return queue.empty(); } + bool empty() const { return queue.empty(); } - virtual ~lock_free_queue() {} + ~lock_free_queue() = default; TPolicy queue; }; diff --git a/include/taskgraph.h b/include/taskgraph.h index 7865472..c5b0d91 100644 --- a/include/taskgraph.h +++ b/include/taskgraph.h @@ -78,11 +78,8 @@ namespace task_scheduler class task_queue_type : public base_task_queue_type { - typedef base_task_queue_type super; public: task_queue_type(task_memory_allocator_type *allocator); - bool push_back(typename base_task< TMemInterface >::task_type * _new_task); - virtual ~task_queue_type() {} }; /// @@ -291,12 +288,6 @@ namespace task_scheduler { } - template < class TMemInterface > - bool base_task_graph< TMemInterface >::task_queue_type::push_back(typename base_task< TMemInterface >::task_type * _new_task) - { - return super::push_back(_new_task); - } - template < class TMemInterface > base_task_graph< TMemInterface >::base_task_graph(thread_pool &_pool) : transient(&task_memory_allocator)