diff options
| author | ancarola <raffaele.ancarola@epfl.ch> | 2019-01-23 21:03:02 +0100 |
|---|---|---|
| committer | ancarola <raffaele.ancarola@epfl.ch> | 2019-01-23 21:03:02 +0100 |
| commit | 10fe93d8c1d6a06b38cad2b491e99833ffe867f1 (patch) | |
| tree | 7c0139faf569f6d540c86fb8a2b1699b42d75b54 /engine/include/core | |
| parent | Labelled, signal (diff) | |
| download | flatland-10fe93d8c1d6a06b38cad2b491e99833ffe867f1.tar.gz flatland-10fe93d8c1d6a06b38cad2b491e99833ffe867f1.zip | |
Signal finalized?
Diffstat (limited to 'engine/include/core')
| -rw-r--r-- | engine/include/core/labelled.hpp | 2 | ||||
| -rw-r--r-- | engine/include/core/signal.hpp | 10 |
2 files changed, 6 insertions, 6 deletions
diff --git a/engine/include/core/labelled.hpp b/engine/include/core/labelled.hpp index 7363e8d..8b458b3 100644 --- a/engine/include/core/labelled.hpp +++ b/engine/include/core/labelled.hpp @@ -19,7 +19,7 @@ struct flat::core::labelled { const std::string label; - labelled(const std::string& label = ""); + labelled(const std::string& label = "", bool allow_null = false); static std::string random_label(uint8_t length = 8); }; diff --git a/engine/include/core/signal.hpp b/engine/include/core/signal.hpp index 4270aa5..be1644a 100644 --- a/engine/include/core/signal.hpp +++ b/engine/include/core/signal.hpp @@ -6,7 +6,7 @@ #include <initializer_list> #include "object.hpp" #include "task.hpp" -#include "types.h" +#include "types.hpp" #include <functional> #include <memory> #include "priority.hpp" @@ -110,11 +110,11 @@ namespace flat void invoke(const signal&); - /* Allow to safely bind e functor */ + /* Allow to safely bind a functor */ template<class T> - static ptr make( const (T::*method(const object*, void*))& fct, - T* obj, - const std::initializer_list<std::string>& filters = {}) + static ptr create( const (T::*method(const object*, void*))& fct, + T* obj, + const std::initializer_list<std::string>& filters = {}) { return new listener(std::bind(fct, ptr), filters); } |