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

attempt to fix linux build

This commit is contained in:
Arvid Norberg 2014-05-25 05:10:30 +00:00
parent 64c09e7607
commit 96f25d6942
1 changed files with 14 additions and 14 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

28
src/kademlia/traversal_algorithm.cpp
View File

@ -42,6 +42,19 @@ POSSIBILITY OF SUCH DAMAGE.
#include "libtorrent/broadcast_socket.hpp" // for cidr_distance #include "libtorrent/broadcast_socket.hpp" // for cidr_distance
#include <libtorrent/socket_io.hpp> // for read_*_endpoint #include <libtorrent/socket_io.hpp> // for read_*_endpoint
#include <boost/bind.hpp>
namespace libtorrent { namespace dht
{
#ifdef TORRENT_DHT_VERBOSE_LOGGING
TORRENT_DEFINE_LOG(traversal)
#endif
using detail::read_v4_endpoint;
#if TORRENT_USE_IPV6
using detail::read_v6_endpoint;
#endif
#if TORRENT_USE_ASSERTS #if TORRENT_USE_ASSERTS
template <class It, class Cmp> template <class It, class Cmp>
bool is_sorted(It b, It e, Cmp cmp) bool is_sorted(It b, It e, Cmp cmp)
@ -60,19 +73,6 @@ bool is_sorted(It b, It e, Cmp cmp)
} }
#endif #endif
#include <boost/bind.hpp>
namespace libtorrent { namespace dht
{
#ifdef TORRENT_DHT_VERBOSE_LOGGING
TORRENT_DEFINE_LOG(traversal)
#endif
using detail::read_v4_endpoint;
#if TORRENT_USE_IPV6
using detail::read_v6_endpoint;
#endif
observer_ptr traversal_algorithm::new_observer(void* ptr observer_ptr traversal_algorithm::new_observer(void* ptr
, udp::endpoint const& ep, node_id const& id) , udp::endpoint const& ep, node_id const& id)
{ {
@ -153,7 +153,7 @@ void traversal_algorithm::add_entry(node_id const& id, udp::endpoint addr, unsig
o->flags |= flags; o->flags |= flags;
TORRENT_ASSERT(is_sorted(m_results.begin(), m_results.end() TORRENT_ASSERT(libtorrent::dht::is_sorted(m_results.begin(), m_results.end()
, boost::bind( , boost::bind(
compare_ref compare_ref
, boost::bind(&observer::id, _1) , boost::bind(&observer::id, _1)