From a2209a6a0e8c406671cd58349629d3f28ee356c2 Mon Sep 17 00:00:00 2001 From: Edouard DUPIN Date: Mon, 18 Jul 2016 02:05:14 +0200 Subject: [PATCH] [DEBUG] correct missing include after update ememory --- esignal/Signal.h | 1 + esignal/details/Signal.hxx | 12 ++++++------ 2 files changed, 7 insertions(+), 6 deletions(-) diff --git a/esignal/Signal.h b/esignal/Signal.h index 2a2fc42..62d90b9 100644 --- a/esignal/Signal.h +++ b/esignal/Signal.h @@ -8,6 +8,7 @@ #pragma once #include +#include #include #include #include diff --git a/esignal/details/Signal.hxx b/esignal/details/Signal.hxx index 05b5e07..967538b 100644 --- a/esignal/details/Signal.hxx +++ b/esignal/details/Signal.hxx @@ -84,7 +84,7 @@ void esignal::Signal::disconnect(size_t _uid) { } template -void esignal::Signal::disconnectShared(const std::shared_ptr& _obj) { +void esignal::Signal::disconnectShared(const ememory::SharedPtr& _obj) { for (size_t iii=0; iii < m_executors.size(); ++iii) { if (m_executors[iii]->isSharedPtr(_obj) == true) { m_executors[iii]->m_removed = true; @@ -133,7 +133,7 @@ void esignal::Signal::Executor::emit(const T_ARGS&... _values) { } template -bool esignal::Signal::Executor::isSharedPtr(const std::shared_ptr& _obj) { +bool esignal::Signal::Executor::isSharedPtr(const ememory::SharedPtr& _obj) { return false; } @@ -141,7 +141,7 @@ bool esignal::Signal::Executor::isSharedPtr(const std::shared_ptr -esignal::Signal::ExecutorShared::ExecutorShared(std::weak_ptr _object, Observer&& _observer) : +esignal::Signal::ExecutorShared::ExecutorShared(ememory::WeakPtr _object, Observer&& _observer) : Executor(std::move(_observer)), m_object(_object) { @@ -150,7 +150,7 @@ esignal::Signal::ExecutorShared::ExecutorShared(std::weak_ptr _ template void esignal::Signal::ExecutorShared::emit(const T_ARGS&... _values) { // TODO: maybe an error if the object is not manage by the same thread. - std::shared_ptr destObject = m_object.lock(); + ememory::SharedPtr destObject = m_object.lock(); if (destObject == nullptr) { Executor::m_removed = true; return; @@ -166,8 +166,8 @@ void esignal::Signal::ExecutorShared::emit(const T_ARGS&... _values) } template -bool esignal::Signal::ExecutorShared::isSharedPtr(const std::shared_ptr& _obj) { - std::shared_ptr destObject = m_object.lock(); +bool esignal::Signal::ExecutorShared::isSharedPtr(const ememory::SharedPtr& _obj) { + ememory::SharedPtr destObject = m_object.lock(); if (destObject == nullptr) { return true; }