merged fixes from RC_0_16

This commit is contained in:
Arvid Norberg
2013-11-08 07:23:36 +00:00
parent a00f396224
commit dafa812109
4 changed files with 20 additions and 4 deletions

View File

@@ -613,7 +613,7 @@ namespace libtorrent
// since we'll mutate it
char* buf = (char*)malloc(size);
memcpy(buf, buffer, size);
bt_peer_connection::append_send_buffer(buf, size, boost::bind(&::free, _1));
bt_append_send_buffer(buf, size, boost::bind(&::free, _1));
}
else
#endif
@@ -2314,7 +2314,7 @@ namespace libtorrent
send_buffer(msg, 13);
}
append_send_buffer(buffer.get(), r.length
bt_append_send_buffer(buffer.get(), r.length
, boost::bind(&session_impl::free_disk_buffer
, boost::ref(m_ses), _1));
buffer.release();