wornvirtue
/
premiere-libtorrent
forked from premiere/premiere-libtorrent
1
0
Fork 0
Code Pull Requests Activity

merged fixes from release branch

This commit is contained in:
Arvid Norberg 2005-11-22 00:18:39 +00:00
parent 9d12136854
commit 2e851505f8
1 changed files with 3 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
src/peer_connection.cpp
View File

@ -2569,7 +2569,7 @@ namespace libtorrent
buffer::interval_type send_buffer = m_send_buffer.data();
// we have data that's scheduled for sending
int to_send = std::min(send_buffer.first.end - send_buffer.first.begin
int to_send = std::min(int(send_buffer.first.end - send_buffer.first.begin)
, amount_to_send);
int sent = m_socket->send(send_buffer.first.begin, to_send);
@ -2578,8 +2578,8 @@ namespace libtorrent
&& to_send > sent)
{
to_send -= sent;
to_send = std::min(to_send, send_buffer.second.end
- send_buffer.second.begin);
to_send = std::min(to_send, int(send_buffer.second.end
- send_buffer.second.begin));
int ret = m_socket->send(send_buffer.second.begin, to_send);
if (ret > 0) sent += ret;
}