summaryrefslogtreecommitdiffstats
path: root/engine/include/core
diff options
context:
space:
mode:
authorancarola <raffaele.ancarola@epfl.ch>2019-01-25 23:47:41 +0100
committerancarola <raffaele.ancarola@epfl.ch>2019-01-25 23:47:41 +0100
commit351f83b6d331eef1fb5e1cbfa8bed25da8f96a57 (patch)
tree2a7ac7dc499f5b764caba981002e7a17bc1687d0 /engine/include/core
parentCore channel in flatland and signal test (diff)
downloadflatland-351f83b6d331eef1fb5e1cbfa8bed25da8f96a57.tar.gz
flatland-351f83b6d331eef1fb5e1cbfa8bed25da8f96a57.zip
Template error on compile signal test
Diffstat (limited to 'engine/include/core')
-rw-r--r--engine/include/core/signal.hpp7
1 files changed, 4 insertions, 3 deletions
diff --git a/engine/include/core/signal.hpp b/engine/include/core/signal.hpp
index 7d91150..a420989 100644
--- a/engine/include/core/signal.hpp
+++ b/engine/include/core/signal.hpp
@@ -6,6 +6,7 @@
#include <initializer_list>
#include "task.hpp"
#include "types.hpp"
+#include "object.hpp"
#include <functional>
#include <memory>
#include "priority.hpp"
@@ -13,7 +14,7 @@
namespace flat
{
- class object;
+ //class object;
namespace core
{
@@ -30,7 +31,7 @@ namespace flat
template<class T>
T * get() {
- return dynamic_cast<T>(data);
+ return reinterpret_cast<T*>(data);
}
void * data;
@@ -123,7 +124,7 @@ namespace flat
template<typename R, typename T>
inline listener::ptr connect(R T::*mf, T& obj, const std::initializer_list<std::string>& filters = {}) {
- return connect(std::bind(mf, obj));
+ return connect(std::bind(mf, obj), filters);
}
static ptr find(const std::string&);