diff options
| author | ancarola <raffaele.ancarola@epfl.ch> | 2019-02-01 14:18:54 +0100 |
|---|---|---|
| committer | ancarola <raffaele.ancarola@epfl.ch> | 2019-02-01 14:18:54 +0100 |
| commit | ea8faf5446cedc0e8e87ba7ffee6917b3adf48f3 (patch) | |
| tree | 9636947bf8594652d159f9bdfd4798d3f23972c7 | |
| parent | std sequences (diff) | |
| download | flatland-ea8faf5446cedc0e8e87ba7ffee6917b3adf48f3.tar.gz flatland-ea8faf5446cedc0e8e87ba7ffee6917b3adf48f3.zip | |
dasf
| -rw-r--r-- | engine/include/core/signal.hpp | 8 |
1 files changed, 4 insertions, 4 deletions
diff --git a/engine/include/core/signal.hpp b/engine/include/core/signal.hpp index 14ec230..2ead34a 100644 --- a/engine/include/core/signal.hpp +++ b/engine/include/core/signal.hpp @@ -254,12 +254,12 @@ namespace flat * corresponding listener, placeholder form */ template<typename R, class ...Args, std::size_t ...Is> - std::shared_ptr<listener<Args...>> p_connect(R (*mf)(Args...), std::index_sequence<Is...> seq, const std::initializer_list<std::string>& filters = {}) + std::shared_ptr<listener<Args...>> p_connect(R (*mf)(Args...), std::index_sequence<Is...>, const std::initializer_list<std::string>& filters = {}) { //using namespace std::placeholders; //return connect<Args...>(std::bind(mf, obj, _1, _2), filters); //using namespace helper; - auto b = std::bind(mf, seq); + auto b = std::bind(mf, helper::placeholder_template<Is>{}...); return _connect(b, filters); } @@ -281,12 +281,12 @@ namespace flat * corresponding listener, placeholder form */ template<typename R, typename T, class ...Args, size_t ...Is> - std::shared_ptr<listener<Args...>> c_connect(R (T::*mf)(Args...), T* obj, std::index_sequence<Is...> seq, const std::initializer_list<std::string>& filters = {}) + std::shared_ptr<listener<Args...>> c_connect(R (T::*mf)(Args...), T* obj, std::index_sequence<Is...>, const std::initializer_list<std::string>& filters = {}) { //using namespace std::placeholders; //return connect<Args...>(std::bind(mf, obj, _1, _2), filters); //using namespace helper; - auto b = std::bind(mf, obj, seq); + auto b = std::bind(mf, obj, helper::placeholder_template<Is>{}...); return _connect(b, filters); } |