Merge remote-tracking branch 'refs/remotes/origin/master' into enet_wip_nothing_to_see_here

2017-03-08 13:25:28 +01:00
parent 247186fe55 b0d61802b6
commit 0393eb408b
2 changed files with 12 additions and 7 deletions
--- a/src/Nazara/Network/SocketPoller.cpp
+++ b/src/Nazara/Network/SocketPoller.cpp
@@ -142,13 +142,15 @@ namespace Nz
 	}

 	/*!
-	* \brief Wait until any registered socket switches to a ready state
+	* \brief Wait until any registered socket switches to a ready state.
 	*
 	* Waits a specific/undetermined amount of time until at least one socket part of the SocketPoller becomes ready.
 	* To query the ready state of the registered socket, use the IsReady function.
 	*
 	* \param msTimeout Maximum time to wait in milliseconds, 0 for infinity
 	*
+	* \return True if at least one socket registered to the poller is ready.
+	*
 	* \remark It is an error to try to unregister a non-registered socket from a SocketPoller.
 	*
 	* \see IsReady