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

Core/Signal: Fix move behaviour with GCC 4.9 ....

This commit is contained in:
Lynix 2017-03-10 17:07:40 +01:00
parent 4d932e9317
commit 9531edfffc
1 changed files with 34 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -246,6 +246,18 @@ namespace Nz
* \brief Core class that represents a connection attached to a signal * \brief Core class that represents a connection attached to a signal
*/ */
/*!
* \brief Constructs a Signal::Connection object with by move semantic
*
* \param connection Connection object to move
*/
template<typename... Args>
Signal<Args...>::Connection::Connection(Connection&& connection) noexcept :
m_ptr(std::move(connection.m_ptr))
{
connection.m_ptr.reset(); //< Fuck you GCC 4.9
}
/*! /*!
* \brief Constructs a Signal::Connection object with a slot * \brief Constructs a Signal::Connection object with a slot
* *
@ -294,6 +306,18 @@ namespace Nz
return !m_ptr.expired(); return !m_ptr.expired();
} }
/*!
* \brief Constructs a Signal::ConnectionGuard object by move semantic
*
* \param connection Connection to move
*/
template<typename... Args>
typename Signal<Args...>::Connection& Signal<Args...>::Connection::operator=(Connection&& connection) noexcept
{
m_ptr = std::move(connection.m_ptr);
connection.m_ptr.reset(); //< Fuck you GCC 4.9
}
/*! /*!
* \class Nz::Signal::ConnectionGuard * \class Nz::Signal::ConnectionGuard
* \brief Core class that represents a RAII for a connection attached to a signal * \brief Core class that represents a RAII for a connection attached to a signal
@ -406,8 +430,11 @@ namespace Nz
template<typename... Args> template<typename... Args>
typename Signal<Args...>::ConnectionGuard& Signal<Args...>::ConnectionGuard::operator=(Connection&& connection) typename Signal<Args...>::ConnectionGuard& Signal<Args...>::ConnectionGuard::operator=(Connection&& connection)
{ {
m_connection.Disconnect(); if (&connection != this)
m_connection = std::move(connection); {
m_connection.Disconnect();
m_connection = std::move(connection);
}
return *this; return *this;
} }
@ -422,8 +449,11 @@ namespace Nz
template<typename... Args> template<typename... Args>
typename Signal<Args...>::ConnectionGuard& Signal<Args...>::ConnectionGuard::operator=(ConnectionGuard&& connection) noexcept typename Signal<Args...>::ConnectionGuard& Signal<Args...>::ConnectionGuard::operator=(ConnectionGuard&& connection) noexcept
{ {
m_connection.Disconnect(); if (&connection != this)
m_connection = std::move(connection.m_connection); {
m_connection.Disconnect();
m_connection = std::move(connection.m_connection);
}
return *this; return *this;
} }