premiere
/
premiere-libtorrent
2
2
Fork 1
Code Issues Pull Requests Releases Wiki Activity

fixed compile warnings

This commit is contained in:
Arvid Norberg 2009-06-10 08:42:05 +00:00
parent f0134c1b11
commit 6b908e5f3f
1 changed files with 8 additions and 8 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

16
src/torrent.cpp
View File

@ -1101,7 +1101,7 @@ namespace libtorrent
ptime now = time_now(); ptime now = time_now();
int tier = INT_MAX; int tier = INT_MAX;
for (int i = 0; i < m_trackers.size(); ++i) for (int i = 0; i < int(m_trackers.size()); ++i)
{ {
announce_entry& ae = m_trackers[i]; announce_entry& ae = m_trackers[i];
if (ae.tier > tier) break; if (ae.tier > tier) break;
@ -3241,7 +3241,7 @@ namespace libtorrent
tree.resize(m_torrent_file->merkle_tree().size()); tree.resize(m_torrent_file->merkle_tree().size());
std::memcpy(&tree[0], mt->string_ptr() std::memcpy(&tree[0], mt->string_ptr()
, (std::min)(mt->string_length(), int(tree.size()) * 20)); , (std::min)(mt->string_length(), int(tree.size()) * 20));
if (mt->string_length() < tree.size() * 20) if (mt->string_length() < int(tree.size()) * 20)
std::memset(&tree[0] + mt->string_length() / 20, 0 std::memset(&tree[0] + mt->string_length() / 20, 0
, tree.size() - mt->string_length() / 20); , tree.size() - mt->string_length() / 20);
m_torrent_file->set_merkle_tree(tree); m_torrent_file->set_merkle_tree(tree);
@ -3459,7 +3459,7 @@ namespace libtorrent
if (!p->connectable) continue; if (!p->connectable) continue;
// don't save peers that don't work // don't save peers that don't work
if (p->failcount >= max_failcount) continue; if (int(p->failcount) >= max_failcount) continue;
#if TORRENT_USE_IPV6 #if TORRENT_USE_IPV6
if (addr.is_v6()) if (addr.is_v6())
@ -4028,7 +4028,7 @@ namespace libtorrent
INVARIANT_CHECK; INVARIANT_CHECK;
TORRENT_ASSERT(index >= 0); TORRENT_ASSERT(index >= 0);
TORRENT_ASSERT(index < m_trackers.size()); TORRENT_ASSERT(index < int(m_trackers.size()));
if (index >= (int)m_trackers.size()) return -1; if (index >= (int)m_trackers.size()) return -1;
while (index > 0 && m_trackers[index].tier == m_trackers[index-1].tier) while (index > 0 && m_trackers[index].tier == m_trackers[index-1].tier)
@ -4047,10 +4047,10 @@ namespace libtorrent
INVARIANT_CHECK; INVARIANT_CHECK;
TORRENT_ASSERT(index >= 0); TORRENT_ASSERT(index >= 0);
TORRENT_ASSERT(index < m_trackers.size()); TORRENT_ASSERT(index < int(m_trackers.size()));
if (index >= (int)m_trackers.size()) return -1; if (index >= (int)m_trackers.size()) return -1;
while (index < m_trackers.size() - 1 && m_trackers[index].tier == m_trackers[index + 1].tier) while (index < int(m_trackers.size()) - 1 && m_trackers[index].tier == m_trackers[index + 1].tier)
{ {
using std::swap; using std::swap;
swap(m_trackers[index], m_trackers[index + 1]); swap(m_trackers[index], m_trackers[index + 1]);
@ -5370,7 +5370,7 @@ namespace libtorrent
std::vector<int> pieces; std::vector<int> pieces;
m_picker->piece_priorities(pieces); m_picker->piece_priorities(pieces);
// make sure all pieces have priority 0 // make sure all pieces have priority 0
TORRENT_ASSERT(std::count(pieces.begin(), pieces.end(), 0) == pieces.size()); TORRENT_ASSERT(std::count(pieces.begin(), pieces.end(), 0) == int(pieces.size()));
} }
} }
if (s == torrent_status::seeding) if (s == torrent_status::seeding)
@ -5466,7 +5466,7 @@ namespace libtorrent
if (m_last_working_tracker >= 0) if (m_last_working_tracker >= 0)
{ {
TORRENT_ASSERT(m_last_working_tracker < m_trackers.size()); TORRENT_ASSERT(m_last_working_tracker < int(m_trackers.size()));
st.current_tracker = m_trackers[m_last_working_tracker].url; st.current_tracker = m_trackers[m_last_working_tracker].url;
} }
else else