← Back to branch summary

~ubuntu-branches/ubuntu/oneiric/libtorrent-rasterbar/oneiric

« back to all changes in this revision

Viewing changes to src/kademlia/traversal_algorithm.cpp

  • Committer: Bazaar Package Importer
  • Author(s): Andrew Starr-Bochicchio
  • Date: 2010-08-10 12:57:25 UTC
  • mfrom: (1.3.8 upstream)
  • Revision ID: james.westby@ubuntu.com-20100810125725-i2o9iblow20w7qde
Tags: 0.15.1-0ubuntu1
https://launchpad.net/bugs/615950
* New upstream point release.

* New package libtorrent-rasterbar6 (bump up library soname). (LP: #615950)
 - Must Conflict/Replace libtorrent-rasterbar5 (= 0.15.0-0ubuntu1) or it will
   fail to install trying to overwrite '/usr/lib/libtorrent-rasterbar.so.6.0.0'

* Sync on git.debian.org/collab-maint/libtorrent-rasterbar.git:
 - debian/{control,rules}: Bump debhelper build-dep to (>= 7.4.10)
   and pass to dh in order to enable parallel build support.
 - debian/watch: Use googlecode.debian.net redirector.

Show diffs side-by-side

added added

removed removed

Lines of Context:
src/kademlia/traversal_algorithm.cpp
40
40
 
41
41
#include <boost/bind.hpp>
42
42
 
43
 
using boost::bind;
44
 
 
45
43
namespace libtorrent { namespace dht
46
44
{
47
45
#ifdef TORRENT_DHT_VERBOSE_LOGGING
63
61
                m_results.begin()
64
62
                , m_results.end()
65
63
                , entry
66
 
                , bind(
 
64
                , boost::bind(
67
65
                        compare_ref
68
 
                        , bind(&result::id, _1)
69
 
                        , bind(&result::id, _2)
 
66
                        , boost::bind(&result::id, _1)
 
67
                        , boost::bind(&result::id, _2)
70
68
                        , m_target
71
69
                )
72
70
        );
74
72
        if (i == m_results.end() || i->id != id)
75
73
        {
76
74
                TORRENT_ASSERT(std::find_if(m_results.begin(), m_results.end()
77
 
                        , bind(&result::id, _1) == id) == m_results.end());
 
75
                        , boost::bind(&result::id, _1) == id) == m_results.end());
78
76
#ifdef TORRENT_DHT_VERBOSE_LOGGING
79
77
                TORRENT_LOG(traversal) << "adding result: " << id << " " << addr;
80
78
#endif