nicer fix for debug iterators
This commit is contained in:
parent
5c5a836398
commit
53c408212d
|
@ -105,9 +105,9 @@ namespace libtorrent
|
||||||
for (std::vector<piece_pos>::const_iterator i = m_piece_map.begin() + m_cursor
|
for (std::vector<piece_pos>::const_iterator i = m_piece_map.begin() + m_cursor
|
||||||
, end(m_piece_map.end()); i != end && (i->have() || i->filtered());
|
, end(m_piece_map.end()); i != end && (i->have() || i->filtered());
|
||||||
++i, ++m_cursor);
|
++i, ++m_cursor);
|
||||||
for (std::vector<piece_pos>::const_iterator i = m_piece_map.begin()
|
for (std::vector<piece_pos>::const_reverse_iterator i = m_piece_map.rend()
|
||||||
+ m_reverse_cursor - 1; m_reverse_cursor > 0 && (i->have() || i->filtered());
|
- m_reverse_cursor; m_reverse_cursor > 0 && (i->have() || i->filtered());
|
||||||
--i, --m_reverse_cursor);
|
++i, --m_reverse_cursor);
|
||||||
|
|
||||||
// the piece index is stored in 20 bits, which limits the allowed
|
// the piece index is stored in 20 bits, which limits the allowed
|
||||||
// number of pieces somewhat
|
// number of pieces somewhat
|
||||||
|
@ -338,8 +338,8 @@ namespace libtorrent
|
||||||
index = num_pieces;
|
index = num_pieces;
|
||||||
if (num_pieces > 0)
|
if (num_pieces > 0)
|
||||||
{
|
{
|
||||||
for (std::vector<piece_pos>::const_iterator i = m_piece_map.begin()
|
for (std::vector<piece_pos>::const_reverse_iterator i = m_piece_map.rend()
|
||||||
+ (index - 1); index > 0 && (i->have() || i->filtered()); i != m_piece_map.begin() ? --i : i, --index);
|
- index; index > 0 && (i->have() || i->filtered()); ++i, --index);
|
||||||
TORRENT_ASSERT(index == num_pieces
|
TORRENT_ASSERT(index == num_pieces
|
||||||
|| m_piece_map[index].have()
|
|| m_piece_map[index].have()
|
||||||
|| m_piece_map[index].filtered());
|
|| m_piece_map[index].filtered());
|
||||||
|
|
Loading…
Reference in New Issue