Merge remote-tracking branch 'origin/DynamicPacketBuffer' into HUDDesync

# Conflicts: # include/Engine/Network/TCPServer.h # src/Engine/Network/TCPServer.cpp
2016-02-22 17:39:48 +01:00
parent 833006744a 34a71b0767
commit 845a30ed0f
14 changed files with 263 additions and 50 deletions
@@ -22,7 +22,7 @@ private:
    boost::asio::io_service m_IOService;
    boost::asio::ip::udp::endpoint m_ReceiverEndpoint;
    std::unique_ptr<boost::asio::ip::udp::socket> m_Socket;
-    int readBuffer(char* data);
+    int readBuffer();
 };

 #endif