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

Merge branch 'master' of https://github.com/arvidn/libtorrent

This commit is contained in:
arvidn 2017-03-30 18:14:09 -04:00
parent 0b6fe4d0bd 923f2c48fc
commit d720b282b8
2 changed files with 3 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
include/libtorrent/aux_/session_impl.hpp
View File

@ -819,6 +819,8 @@ namespace libtorrent
// peer class for local peers // peer class for local peers
peer_class_t m_local_peer_class{0}; peer_class_t m_local_peer_class{0};
resolver m_host_resolver;
tracker_manager m_tracker_manager; tracker_manager m_tracker_manager;
torrent_map m_torrents; torrent_map m_torrents;
@ -1163,8 +1165,6 @@ namespace libtorrent
// time it's called, to force the windows disk cache to be flushed // time it's called, to force the windows disk cache to be flushed
deadline_timer m_close_file_timer; deadline_timer m_close_file_timer;
resolver m_host_resolver;
// the index of the torrent that will be offered to // the index of the torrent that will be offered to
// connect to a peer next time on_tick is called. // connect to a peer next time on_tick is called.
// This implements a round robin peer connections among // This implements a round robin peer connections among

2
src/session_impl.cpp
View File

@ -423,6 +423,7 @@ namespace aux {
, m_disk_thread(m_io_service, m_stats_counters) , m_disk_thread(m_io_service, m_stats_counters)
, m_download_rate(peer_connection::download_channel) , m_download_rate(peer_connection::download_channel)
, m_upload_rate(peer_connection::upload_channel) , m_upload_rate(peer_connection::upload_channel)
, m_host_resolver(m_io_service)
, m_tracker_manager( , m_tracker_manager(
std::bind(&session_impl::send_udp_packet, this, false, _1, _2, _3, _4) std::bind(&session_impl::send_udp_packet, this, false, _1, _2, _3, _4)
, std::bind(&session_impl::send_udp_packet_hostname, this, _1, _2, _3, _4, _5) , std::bind(&session_impl::send_udp_packet_hostname, this, _1, _2, _3, _4, _5)
@ -462,7 +463,6 @@ namespace aux {
, m_timer(m_io_service) , m_timer(m_io_service)
, m_lsd_announce_timer(m_io_service) , m_lsd_announce_timer(m_io_service)
, m_close_file_timer(m_io_service) , m_close_file_timer(m_io_service)
, m_host_resolver(m_io_service)
{ {
update_time_now(); update_time_now();
} }