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

merged fixes from RC_0_16

This commit is contained in:
Arvid Norberg 2013-11-02 03:35:45 +00:00
parent 90e7a4c9e3
commit b911129a12
2 changed files with 3 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
src/kademlia/traversal_algorithm.cpp
View File

@ -454,7 +454,7 @@ void traversal_algorithm::status(dht_lookup& l)
observer& o = **i; observer& o = **i;
if (o.flags & observer::flag_queried) if (o.flags & observer::flag_queried)
{ {
last_sent = (std::min)(last_sent, total_seconds(now - o.sent())); last_sent = (std::min)(last_sent, int(total_seconds(now - o.sent())));
if (o.has_short_timeout()) ++l.first_timeout; if (o.has_short_timeout()) ++l.first_timeout;
continue; continue;
} }

2
src/policy.cpp
View File

@ -1190,7 +1190,9 @@ namespace libtorrent
#ifdef TORRENT_DEBUG #ifdef TORRENT_DEBUG
else else
{ {
#if TORRENT_USE_I2P
if (!p->is_i2p_addr) if (!p->is_i2p_addr)
#endif
{ {
std::pair<iterator, iterator> range = find_peers(p->address()); std::pair<iterator, iterator> range = find_peers(p->address());
TORRENT_ASSERT(range.second - range.first == 1); TORRENT_ASSERT(range.second - range.first == 1);