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

made routing table support safe iterators on gcc

This commit is contained in:
Arvid Norberg 2008-09-16 17:21:24 +00:00
parent 53c408212d
commit a62ce3bc1a
1 changed files with 10 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

16
include/libtorrent/kademlia/routing_table.hpp
View File

@ -104,9 +104,9 @@ namespace aux
, bucket_iterator_t end) , bucket_iterator_t end)
: m_bucket_iterator(begin) : m_bucket_iterator(begin)
, m_bucket_end(end) , m_bucket_end(end)
, m_iterator(begin != end ? begin->first.begin() : bucket_t::const_iterator())
{ {
if (m_bucket_iterator == m_bucket_end) return; if (m_bucket_iterator == m_bucket_end) return;
m_iterator = begin->first.begin();
while (m_iterator == m_bucket_iterator->first.end()) while (m_iterator == m_bucket_iterator->first.end())
{ {
if (++m_bucket_iterator == m_bucket_end) if (++m_bucket_iterator == m_bucket_end)
@ -119,14 +119,14 @@ namespace aux
{ {
return m_bucket_iterator == other.m_bucket_iterator return m_bucket_iterator == other.m_bucket_iterator
&& (m_bucket_iterator == m_bucket_end && (m_bucket_iterator == m_bucket_end
|| m_iterator == other.m_iterator); || *m_iterator == other.m_iterator);
} }
void increment() void increment()
{ {
TORRENT_ASSERT(m_bucket_iterator != m_bucket_end); TORRENT_ASSERT(m_bucket_iterator != m_bucket_end);
++m_iterator; ++*m_iterator;
while (m_iterator == m_bucket_iterator->first.end()) while (*m_iterator == m_bucket_iterator->first.end())
{ {
if (++m_bucket_iterator == m_bucket_end) if (++m_bucket_iterator == m_bucket_end)
break; break;
@ -137,12 +137,16 @@ namespace aux
node_entry const& dereference() const node_entry const& dereference() const
{ {
TORRENT_ASSERT(m_bucket_iterator != m_bucket_end); TORRENT_ASSERT(m_bucket_iterator != m_bucket_end);
return *m_iterator; return **m_iterator;
} }
bucket_iterator_t m_bucket_iterator; bucket_iterator_t m_bucket_iterator;
bucket_iterator_t m_bucket_end; bucket_iterator_t m_bucket_end;
bucket_t::const_iterator m_iterator; // when debug iterators are enabled, default constructed
// iterators are not allowed to be copied. In the case
// where the routing table is empty, m_iterator would be
// default constructed and not copyable.
boost::optional<bucket_t::const_iterator> m_iterator;
}; };
} // namespace aux } // namespace aux