sid
/
NazaraEngine
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Core/Signal: No longer return rvalue 

Former-commit-id: 96ff0eb63fa0e22952783119be6b739a59cb422a
This commit is contained in:
Lynix 2015-06-07 03:35:54 +02:00
parent 991c1af1ca
commit 303cdbb0cb
2 changed files with 9 additions and 9 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

8
include/Nazara/Core/Signal.hpp
View File

@ -26,10 +26,10 @@ class NzSignal
void Clear(); void Clear();
Connection&& Connect(const Callback& func); Connection Connect(const Callback& func);
Connection&& Connect(Callback&& func); Connection Connect(Callback&& func);
template<typename O> Connection&& Connect(O& object, void (O::*method)(Args...)); template<typename O> Connection Connect(O& object, void (O::*method)(Args...));
template<typename O> Connection&& Connect(O* object, void (O::*method)(Args...)); template<typename O> Connection Connect(O* object, void (O::*method)(Args...));
void operator()(Args... args); void operator()(Args... args);

10
include/Nazara/Core/Signal.inl
View File

@ -19,13 +19,13 @@ void NzSignal<Args...>::Clear()
} }
template<typename... Args> template<typename... Args>
typename NzSignal<Args...>::Connection&& NzSignal<Args...>::Connect(const Callback& func) typename NzSignal<Args...>::Connection NzSignal<Args...>::Connect(const Callback& func)
{ {
return Connect(std::move(Callback(func))); return Connect(Callback(func));
} }
template<typename... Args> template<typename... Args>
typename NzSignal<Args...>::Connection&& NzSignal<Args...>::Connect(Callback&& func) typename NzSignal<Args...>::Connection NzSignal<Args...>::Connect(Callback&& func)
{ {
NazaraAssert(func, "Invalid function"); NazaraAssert(func, "Invalid function");
@ -40,7 +40,7 @@ typename NzSignal<Args...>::Connection&& NzSignal<Args...>::Connect(Callback&& f
template<typename... Args> template<typename... Args>
template<typename O> template<typename O>
typename NzSignal<Args...>::Connection&& NzSignal<Args...>::Connect(O& object, void (O::*method) (Args...)) typename NzSignal<Args...>::Connection NzSignal<Args...>::Connect(O& object, void (O::*method) (Args...))
{ {
return Connect([&object, method] (Args&&... args) return Connect([&object, method] (Args&&... args)
{ {
@ -50,7 +50,7 @@ typename NzSignal<Args...>::Connection&& NzSignal<Args...>::Connect(O& object, v
template<typename... Args> template<typename... Args>
template<typename O> template<typename O>
typename NzSignal<Args...>::Connection&& NzSignal<Args...>::Connect(O* object, void (O::*method)(Args...)) typename NzSignal<Args...>::Connection NzSignal<Args...>::Connect(O* object, void (O::*method)(Args...))
{ {
return Connect([object, method] (Args&&... args) return Connect([object, method] (Args&&... args)
{ {