atria-soft/esignal
1
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity

[DEV] update to the new ETK allocator wrapper

Browse Source
This commit is contained in:
Edouard DUPIN 2017-10-21 19:05:21 +02:00
parent 37a1dce0b4
commit 85423b4823
2 changed files with 4 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
esignal/Signal.hpp
View File

@ -316,7 +316,7 @@ template<class... T_ARGS>
template<class OBSERVER_TYPE > template<class OBSERVER_TYPE >
esignal::Connection esignal::SignalInternal<T_ARGS...>::connect(OBSERVER_TYPE&& _observer ) { esignal::Connection esignal::SignalInternal<T_ARGS...>::connect(OBSERVER_TYPE&& _observer ) {
ESIGNAL_DEBUG("esignal: '" << getName() << "' try connect: '" << getName() << "' (observer)"); ESIGNAL_DEBUG("esignal: '" << getName() << "' try connect: '" << getName() << "' (observer)");
ememory::UniquePtr<Executor> executer(new Executor(etk::forward<OBSERVER_TYPE>(_observer))); ememory::UniquePtr<Executor> executer(ETK_NEW(Executor, etk::forward<OBSERVER_TYPE>(_observer)));
size_t uid = executer->m_uid; size_t uid = executer->m_uid;
m_executors.pushBack(etk::move(executer)); m_executors.pushBack(etk::move(executer));
if (m_connectionObserver!=nullptr) { if (m_connectionObserver!=nullptr) {
@ -336,7 +336,7 @@ esignal::Connection esignal::SignalInternal<T_ARGS...>::connect(CLASS_TYPE* _cla
ESIGNAL_ERROR(" '" << getName() << "' Class pointer in nullptr"); ESIGNAL_ERROR(" '" << getName() << "' Class pointer in nullptr");
return esignal::Connection(); return esignal::Connection();
} }
ememory::UniquePtr<Executor> executer(new Executor([=](const T_ARGS& ... _argBase){ ememory::UniquePtr<Executor> executer(ETK_NEW(Executor, [=](const T_ARGS& ... _argBase){
(*_class.*_func)(_argBase..., _arg... ); (*_class.*_func)(_argBase..., _arg... );
})); }));
size_t uid = executer->m_uid; size_t uid = executer->m_uid;
@ -364,7 +364,7 @@ void esignal::SignalInternal<T_ARGS...>::connect(const ememory::SharedPtr<PARENT
return; return;
} }
CLASS_TYPE* directPointer = obj2.get(); CLASS_TYPE* directPointer = obj2.get();
ememory::UniquePtr<ExecutorShared> executer(new ExecutorShared(_class, [=]( const T_ARGS& ... _argBase){ ememory::UniquePtr<Executor> executer(ETK_NEW(ExecutorShared, _class, [=]( const T_ARGS& ... _argBase){
// TODO : Check if compilator does not use the shared ptr ... // TODO : Check if compilator does not use the shared ptr ...
(*directPointer.*_func)(_argBase..., _args... ); (*directPointer.*_func)(_argBase..., _args... );
})); }));

2
test/test_signal_recursive.cpp
View File

@ -28,7 +28,7 @@ static auto callbackInt = [](int32_t _a){
TEST(test_signal_recursive, base) { TEST(test_signal_recursive, base) {
tmpRetInt32 = -1; tmpRetInt32 = -1;
signalll = new esignal::Signal<int32_t>(); signalll = ETK_NEW(esignal::Signal<int32_t>);
EXPECT_EQ(signalll->size(), 0); EXPECT_EQ(signalll->size(), 0);
EXPECT_EQ(signalll->empty(), true); EXPECT_EQ(signalll->empty(), true);
esignal::Connection connection1 = signalll->connect(callbackInt); esignal::Connection connection1 = signalll->connect(callbackInt);