summaryrefslogtreecommitdiffstats
path: root/engine
diff options
context:
space:
mode:
Diffstat (limited to 'engine')
-rw-r--r--engine/include/core/signal.hpp4
-rw-r--r--engine/signal.cpp4
2 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;