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

2017-05-19 16:32:07 +02:00
parent 53f865c42c 09bace0f28
commit 555f44edeb
5 changed files with 63 additions and 12 deletions
--- a/include/Nazara/Network/UdpSocket.hpp
+++ b/include/Nazara/Network/UdpSocket.hpp
@@ -33,7 +33,6 @@ namespace Nz

 			inline IpAddress GetBoundAddress() const;
 			inline UInt16 GetBoundPort() const;
-			inline SocketState GetState() const;

 			inline bool IsBroadcastingEnabled() const;

--- a/include/Nazara/Network/UdpSocket.inl
+++ b/include/Nazara/Network/UdpSocket.inl
@@ -103,16 +103,6 @@ namespace Nz
 		return m_boundAddress.GetPort();
 	}

-	/*!
-	* \brief Gets the state of the socket
-	* \return State of the socket
-	*/
-
-	inline SocketState UdpSocket::GetState() const
-	{
-		return m_state;
-	}
-
 	/*!
 	* \brief Checks whether the broadcasting is enabled
 	* \return true If it is the case