Merge branch 'master' into nazara-next

2020-09-17 20:28:11 +02:00
parent 3f6f18859c 980d200092
commit 790815e9ee
270 changed files with 106800 additions and 334 deletions
--- a/src/Nazara/Network/AbstractSocket.cpp
+++ b/src/Nazara/Network/AbstractSocket.cpp
@@ -71,7 +71,7 @@ namespace Nz
 	* \brief Closes the socket
 	*/

-	void AbstractSocket::Close()
+	void AbstractSocket::Close() noexcept
 	{
 		if (m_handle != SocketImpl::InvalidHandle)
 		{
@@ -237,7 +237,7 @@ namespace Nz
 	* \param abstractSocket AbstractSocket to move in this
 	*/

-	AbstractSocket& AbstractSocket::operator=(AbstractSocket&& abstractSocket)
+	AbstractSocket& AbstractSocket::operator=(AbstractSocket&& abstractSocket) noexcept
 	{
 		Close();