diff options
| author | Nao Pross <naopross@thearcway.org> | 2019-01-23 17:09:11 +0100 |
|---|---|---|
| committer | Nao Pross <naopross@thearcway.org> | 2019-01-23 17:09:36 +0100 |
| commit | d67447c90ef9bbb4abce24e425e698a846f1bd5d (patch) | |
| tree | a28790170659abac3223eb75da629bf3c8c44236 /engine/include/core | |
| parent | Delete build directory (diff) | |
| parent | Fix bug in RAII jobs, debug session on ts3 (diff) | |
| download | flatland-d67447c90ef9bbb4abce24e425e698a846f1bd5d.tar.gz flatland-d67447c90ef9bbb4abce24e425e698a846f1bd5d.zip | |
Merge branch 'raii-task'
Diffstat (limited to 'engine/include/core')
| -rw-r--r-- | engine/include/core/priority.hpp | 2 | ||||
| -rw-r--r-- | engine/include/core/task.hpp | 6 |
2 files changed, 6 insertions, 2 deletions
diff --git a/engine/include/core/priority.hpp b/engine/include/core/priority.hpp index 1219d26..d6c9b35 100644 --- a/engine/include/core/priority.hpp +++ b/engine/include/core/priority.hpp @@ -33,7 +33,7 @@ namespace flat { return lhs.priority() < rhs.priority(); } - bool operator()(const std::weak_ptr<prioritized> lhs, const std::weak_ptr<prioritized>& rhs) { + bool operator()(const std::weak_ptr<prioritized> lhs, const std::weak_ptr<prioritized> rhs) { if (auto l = lhs.lock()) { if (auto r = rhs.lock()) { // if both valid, check their priority diff --git a/engine/include/core/task.hpp b/engine/include/core/task.hpp index d886fcd..570e547 100644 --- a/engine/include/core/task.hpp +++ b/engine/include/core/task.hpp @@ -24,9 +24,13 @@ namespace flat { callback m_callback; }; - struct job : private queue<std::weak_ptr<task>> { + struct job : public queue<std::weak_ptr<task>> { std::shared_ptr<task> make_task(task::callback f, priority_t p = priority_t::none); void invoke_tasks(); + + inline void operator()() { + invoke_tasks(); + } }; } } |