Update talk to 61549749.

TBR=wu@webrtc.org

Review URL: https://webrtc-codereview.appspot.com/8709004

git-svn-id: http://webrtc.googlecode.com/svn/trunk@5549 4adac7df-926f-26a2-2b94-8c16560cd09d
This commit is contained in:
mallinath@webrtc.org
2014-02-14 00:56:12 +00:00
parent b9a088b920
commit 385857dfd4
56 changed files with 370 additions and 150 deletions

View File

@@ -83,7 +83,7 @@ class TCPPort : public Port {
// Handles sending using the local TCP socket.
virtual int SendTo(const void* data, size_t size,
const talk_base::SocketAddress& addr,
talk_base::DiffServCodePoint dscp,
const talk_base::PacketOptions& options,
bool payload);
// Accepts incoming TCP connection.
@@ -128,7 +128,7 @@ class TCPConnection : public Connection {
virtual ~TCPConnection();
virtual int Send(const void* data, size_t size,
talk_base::DiffServCodePoint dscp);
const talk_base::PacketOptions& options);
virtual int GetError();
talk_base::AsyncPacketSocket* socket() { return socket_; }