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

Merge remote-tracking branch 'refs/remotes/origin/master' into ast-shader-generation

Browse Source
This commit is contained in:
Lynix
2017-01-15 14:47:20 +01:00
parent 27fcfe2fb1 c9458eeb17
commit 07e6a405c5
11 changed files with 151 additions and 37 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@@ -33,7 +33,7 @@ namespace Nz
Signal();
Signal(const Signal&) = delete;
Signal(Signal&& signal);
Signal(Signal&& signal) noexcept;
~Signal() = default;
void Clear();
@@ -48,7 +48,7 @@ namespace Nz
void operator()(Args... args) const;
Signal& operator=(const Signal&) = delete;
Signal& operator=(Signal&& signal);
Signal& operator=(Signal&& signal) noexcept;
private:
struct Slot;

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

@@ -32,7 +32,7 @@ namespace Nz
*/
template<typename... Args>
Signal<Args...>::Signal(Signal&& signal)
Signal<Args...>::Signal(Signal&& signal) noexcept
{
operator=(std::move(signal));
}
@@ -182,7 +182,7 @@ namespace Nz
*/
template<typename... Args>
Signal<Args...>& Signal<Args...>::operator=(Signal&& signal)
Signal<Args...>& Signal<Args...>::operator=(Signal&& signal) noexcept
{
m_slots = std::move(signal.m_slots);
m_slotIterator = signal.m_slotIterator;