wornvirtue
/
premiere-libtorrent
forked from premiere/premiere-libtorrent
1
0
Fork 0
Code Pull Requests Activity

update libsimulator submodule

This commit is contained in:
arvidn 2015-10-25 10:55:20 -04:00
parent 475fd61b4b
commit 3cc464805f
4 changed files with 7 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
include/libtorrent/enum_net.hpp
View File

@ -38,7 +38,6 @@ POSSIBILITY OF SUCH DAMAGE.
#include "libtorrent/aux_/disable_warnings_push.hpp"
#include <vector>
#include <boost/asio/ip/tcp.hpp>
#if TORRENT_USE_IFCONF || TORRENT_USE_NETLINK || TORRENT_USE_SYSCTL
#include <sys/socket.h> // for SO_BINDTODEVICE
@ -49,6 +48,7 @@ POSSIBILITY OF SUCH DAMAGE.
#include "libtorrent/io_service_fwd.hpp"
#include "libtorrent/address.hpp"
#include "libtorrent/error_code.hpp"
#include "libtorrent/socket.hpp"
namespace libtorrent
{
@ -119,7 +119,7 @@ namespace libtorrent
address bind_to_device(io_service& ios, Socket& sock
, bool ipv4, char const* device_name, int port, error_code& ec)
{
boost::asio::ip::tcp::endpoint bind_ep(address_v4::any(), port);
tcp::endpoint bind_ep(address_v4::any(), port);
address ip = address::from_string(device_name, ec);
if (!ec)

3
include/libtorrent/kademlia/node.hpp
View File

@ -47,6 +47,7 @@ POSSIBILITY OF SUCH DAMAGE.
#include <libtorrent/kademlia/item.hpp>
#include <libtorrent/io.hpp>
#include <libtorrent/socket.hpp> // for udp::endpoint
#include <libtorrent/session_settings.hpp>
#include <libtorrent/assert.hpp>
#include <libtorrent/thread.hpp>
@ -172,7 +173,7 @@ public:
void announce(sha1_hash const& info_hash, int listen_port, int flags
, boost::function<void(std::vector<tcp::endpoint> const&)> f);
void direct_request(boost::asio::ip::udp::endpoint ep, entry& e
void direct_request(udp::endpoint ep, entry& e
, boost::function<void(msg const&)> f);
void get_item(sha1_hash const& target, boost::function<bool(item&, bool)> f);

2
simulation/libsimulator

@ -1 +1 @@
Subproject commit fa1e83614ca96b4802a4c6cea9488a93111be86d
Subproject commit de8f9178b63bc472a67f5f9654032034177f3c41

2
src/kademlia/node.cpp
View File

@ -407,7 +407,7 @@ void node::announce(sha1_hash const& info_hash, int listen_port, int flags
, listen_port, info_hash, flags), flags & node::flag_seed);
}
void node::direct_request(boost::asio::ip::udp::endpoint ep, entry& e
void node::direct_request(udp::endpoint ep, entry& e
, boost::function<void(msg const&)> f)
{
// not really a traversal