diff options
| author | ancarola <raffaele.ancarola@epfl.ch> | 2019-01-23 15:04:11 +0100 |
|---|---|---|
| committer | ancarola <raffaele.ancarola@epfl.ch> | 2019-01-23 15:04:11 +0100 |
| commit | d672a56aa50ab34672bc102ac6b3562945bf863c (patch) | |
| tree | f78d2717fa8c63f9fb6c20004b8c725273b7d7d2 | |
| parent | Use custom comparison for core::prioritize (instead of std::less) (diff) | |
| download | flatland-d672a56aa50ab34672bc102ac6b3562945bf863c.tar.gz flatland-d672a56aa50ab34672bc102ac6b3562945bf863c.zip | |
signal opt
| -rw-r--r-- | engine/include/core/signal.hpp | 4 | ||||
| -rw-r--r-- | engine/signal.cpp | 4 | ||||
| m--------- | lib/libmm | 0 | ||||
| m--------- | lib/libwrapsdl2 | 0 |
4 files changed, 4 insertions, 4 deletions
diff --git a/engine/include/core/signal.hpp b/engine/include/core/signal.hpp index 755f3ed..2393bc7 100644 --- a/engine/include/core/signal.hpp +++ b/engine/include/core/signal.hpp @@ -38,7 +38,7 @@ namespace flat class channel : virtual public object { /* Post processing signal stacking */ - prior_set<signal> stack; + queue<signal> stack; /* Listeners list */ std::list<listener*> listeners; @@ -51,7 +51,7 @@ namespace flat public: - channel(const std::string& id = "", priority_t priority = priority_t::none); + channel(const std::string& id = "", priority_t task_priority = priority_t::none); ~channel(); void emit(const signal&); diff --git a/engine/signal.cpp b/engine/signal.cpp index 3804e22..5eac3eb 100644 --- a/engine/signal.cpp +++ b/engine/signal.cpp @@ -1,4 +1,5 @@ #include "core/signal.hpp" +#include <functional> using namespace std; using namespace flat::core; @@ -14,8 +15,7 @@ channel::channel(const string& id, priority_t prior) ; /* Initialize task, post-process, fifth priority */ - checker = new task( this, - &channel::post_processing, + checker = new task( bind(&channel::post_processing, this), prior); string ID = (id.empty()) ? object::random_id() : id; diff --git a/lib/libmm b/lib/libmm -Subproject ba03d198b82733043919fda918a80f4bb81800a +Subproject e6595cf9c527e97198806c48aa0a14ae8e895e8 diff --git a/lib/libwrapsdl2 b/lib/libwrapsdl2 new file mode 160000 +Subproject 66bb51fa6148d6910da054bacd4fcbd2fa7b5ba |