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/include/Nazara/Network/AbstractSocket.hpp
+++ b/include/Nazara/Network/AbstractSocket.hpp
@@ -22,7 +22,7 @@ namespace Nz
 			AbstractSocket(AbstractSocket&& abstractSocket) noexcept;
 			virtual ~AbstractSocket();

-			void Close();
+			void Close() noexcept;

 			void EnableBlocking(bool blocking);

@@ -41,7 +41,7 @@ namespace Nz
 			void SetSendBufferSize(std::size_t size);

 			AbstractSocket& operator=(const AbstractSocket&) = delete;
-			AbstractSocket& operator=(AbstractSocket&& abstractSocket);
+			AbstractSocket& operator=(AbstractSocket&& abstractSocket) noexcept;

 			// Signals:
 			NazaraSignal(OnStateChanged, const AbstractSocket* /*socket*/, SocketState /*oldState*/, SocketState /*newState*/);