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

mark up some override functions and fix other clang warnings

This commit is contained in:
arvidn 2015-12-13 19:44:42 -05:00
parent 9e51700739
commit 505ae508f4
15 changed files with 164 additions and 138 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

5
bindings/python/src/fingerprint.cpp
View File

@ -3,8 +3,13 @@
// file LICENSE_1_0.txt or copy at http://www.boost.org/LICENSE_1_0.txt)
#include <libtorrent/fingerprint.hpp>
#include <libtorrent/aux_/disable_warnings_push.hpp>
#include <boost/python.hpp>
#include <libtorrent/aux_/disable_warnings_pop.hpp>
void bind_fingerprint()
{
using namespace boost::python;

4
bindings/python/src/gil.hpp
View File

@ -5,11 +5,15 @@
#ifndef GIL_070107_HPP
# define GIL_070107_HPP
#include <libtorrent/aux_/disable_warnings_push.hpp>
# include <boost/python/make_function.hpp>
# include <boost/python/def_visitor.hpp>
# include <boost/python/signature.hpp>
# include <boost/mpl/at.hpp>
#include <libtorrent/aux_/disable_warnings_pop.hpp>
//namespace libtorrent { namespace python {
// RAII helper to release GIL.

2
include/libtorrent/aux_/disable_warnings_push.hpp
View File

@ -68,6 +68,8 @@ POSSIBILITY OF SUCH DAMAGE.
#pragma clang diagnostic ignored "-Wc++11-extensions"
#pragma clang diagnostic ignored "-Wextra-semi"
#pragma clang diagnostic ignored "-Wunused-parameter"
#pragma clang diagnostic ignored "-Wreserved-id-macro"
#pragma clang diagnostic ignored "-Wunused-local-typedef"
#endif
#ifdef _MSC_VER

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

@ -159,7 +159,7 @@ namespace libtorrent
// this is the link between the main thread and the
// thread started to run the main downloader loop
struct TORRENT_EXTRA_EXPORT session_impl
struct TORRENT_EXTRA_EXPORT session_impl TORRENT_FINAL
: session_interface
, dht::dht_observer
, boost::noncopyable
@ -201,10 +201,10 @@ namespace libtorrent
void add_ses_extension(boost::shared_ptr<plugin> ext);
#endif
#if TORRENT_USE_ASSERTS
bool has_peer(peer_connection const* p) const TORRENT_OVERRIDE TORRENT_FINAL;
bool any_torrent_has_peer(peer_connection const* p) const TORRENT_OVERRIDE TORRENT_FINAL;
bool is_single_thread() const { return single_threaded::is_single_thread(); }
bool is_posting_torrent_updates() const TORRENT_OVERRIDE TORRENT_FINAL { return m_posting_torrent_updates; }
bool has_peer(peer_connection const* p) const TORRENT_OVERRIDE;
bool any_torrent_has_peer(peer_connection const* p) const TORRENT_OVERRIDE;
bool is_single_thread() const TORRENT_OVERRIDE { return single_threaded::is_single_thread(); }
bool is_posting_torrent_updates() const TORRENT_OVERRIDE { return m_posting_torrent_updates; }
// this is set while the session is building the
// torrent status update message
bool m_posting_torrent_updates;
@ -212,15 +212,15 @@ namespace libtorrent
void open_listen_port();
torrent_peer_allocator_interface* get_peer_allocator() TORRENT_OVERRIDE TORRENT_FINAL
torrent_peer_allocator_interface* get_peer_allocator() TORRENT_OVERRIDE
{ return &m_peer_allocator; }
io_service& get_io_service() TORRENT_OVERRIDE TORRENT_FINAL { return m_io_service; }
resolver_interface& get_resolver() TORRENT_OVERRIDE TORRENT_FINAL { return m_host_resolver; }
io_service& get_io_service() TORRENT_OVERRIDE { return m_io_service; }
resolver_interface& get_resolver() TORRENT_OVERRIDE { return m_host_resolver; }
void async_resolve(std::string const& host, int flags
, callback_t const& h) TORRENT_OVERRIDE TORRENT_FINAL;
, callback_t const& h) TORRENT_OVERRIDE;
std::vector<torrent*>& torrent_list(int i) TORRENT_OVERRIDE TORRENT_FINAL
std::vector<torrent*>& torrent_list(int i) TORRENT_OVERRIDE
{
TORRENT_ASSERT(i >= 0);
TORRENT_ASSERT(i < session_interface::num_torrent_lists);
@ -231,13 +231,13 @@ namespace libtorrent
// attempts, because this torrent needs more peers.
// this is typically done when a torrent starts out and
// need the initial push to connect peers
void prioritize_connections(boost::weak_ptr<torrent> t) TORRENT_OVERRIDE TORRENT_FINAL;
void prioritize_connections(boost::weak_ptr<torrent> t) TORRENT_OVERRIDE;
// if we are listening on an IPv6 interface
// this will return one of the IPv6 addresses on this
// machine, otherwise just an empty endpoint
tcp::endpoint get_ipv6_interface() const TORRENT_OVERRIDE TORRENT_FINAL;
tcp::endpoint get_ipv4_interface() const TORRENT_OVERRIDE TORRENT_FINAL;
tcp::endpoint get_ipv6_interface() const TORRENT_OVERRIDE;
tcp::endpoint get_ipv4_interface() const TORRENT_OVERRIDE;
void async_accept(boost::shared_ptr<tcp::acceptor> const& listener, bool ssl);
void on_accept_connection(boost::shared_ptr<socket_type> const& s
@ -253,43 +253,43 @@ namespace libtorrent
void get_feeds(std::vector<feed_handle>* f) const;
#endif
boost::weak_ptr<torrent> find_torrent(sha1_hash const& info_hash) const TORRENT_OVERRIDE TORRENT_FINAL;
boost::weak_ptr<torrent> find_torrent(sha1_hash const& info_hash) const TORRENT_OVERRIDE;
boost::weak_ptr<torrent> find_torrent(std::string const& uuid) const;
#ifndef TORRENT_DISABLE_MUTABLE_TORRENTS
std::vector<boost::shared_ptr<torrent> > find_collection(
std::string const& collection) const TORRENT_OVERRIDE TORRENT_FINAL;
std::string const& collection) const TORRENT_OVERRIDE;
#endif
boost::weak_ptr<torrent> find_disconnect_candidate_torrent() const TORRENT_OVERRIDE TORRENT_FINAL;
int num_torrents() const TORRENT_OVERRIDE TORRENT_FINAL { return int(m_torrents.size()); }
boost::weak_ptr<torrent> find_disconnect_candidate_torrent() const TORRENT_OVERRIDE;
int num_torrents() const TORRENT_OVERRIDE { return int(m_torrents.size()); }
void insert_torrent(sha1_hash const& ih, boost::shared_ptr<torrent> const& t
, std::string uuid);
void insert_uuid_torrent(std::string uuid, boost::shared_ptr<torrent> const& t)
, std::string uuid) TORRENT_OVERRIDE;
void insert_uuid_torrent(std::string uuid, boost::shared_ptr<torrent> const& t) TORRENT_OVERRIDE
{ m_uuids.insert(std::make_pair(uuid, t)); }
boost::shared_ptr<torrent> delay_load_torrent(sha1_hash const& info_hash
, peer_connection* pc);
void set_queue_position(torrent* t, int p);
, peer_connection* pc) TORRENT_OVERRIDE;
void set_queue_position(torrent* t, int p) TORRENT_OVERRIDE;
peer_id const& get_peer_id() const { return m_peer_id; }
peer_id const& get_peer_id() const TORRENT_OVERRIDE { return m_peer_id; }
void close_connection(peer_connection* p, error_code const& ec);
void close_connection(peer_connection* p, error_code const& ec) TORRENT_OVERRIDE;
#ifndef TORRENT_NO_DEPRECATE
void set_settings(libtorrent::session_settings const& s);
libtorrent::session_settings deprecated_settings() const;
#endif
void apply_settings_pack(boost::shared_ptr<settings_pack> pack);
void apply_settings_pack(boost::shared_ptr<settings_pack> pack) TORRENT_OVERRIDE;
void apply_settings_pack_impl(settings_pack const& pack);
session_settings const& settings() const TORRENT_OVERRIDE TORRENT_FINAL { return m_settings; }
session_settings const& settings() const TORRENT_OVERRIDE { return m_settings; }
settings_pack get_settings() const;
#ifndef TORRENT_DISABLE_DHT
dht::dht_tracker* dht() TORRENT_OVERRIDE TORRENT_FINAL { return m_dht.get(); }
bool announce_dht() const TORRENT_OVERRIDE TORRENT_FINAL { return !m_listen_sockets.empty(); }
dht::dht_tracker* dht() TORRENT_OVERRIDE { return m_dht.get(); }
bool announce_dht() const TORRENT_OVERRIDE { return !m_listen_sockets.empty(); }
void add_dht_node_name(std::pair<std::string, int> const& node);
void add_dht_node(udp::endpoint n) TORRENT_OVERRIDE TORRENT_FINAL;
void add_dht_node(udp::endpoint n) TORRENT_OVERRIDE;
void add_dht_router(std::pair<std::string, int> const& node);
void set_dht_settings(dht_settings const& s);
dht_settings const& get_dht_settings() const { return m_dht_settings; }
@ -297,12 +297,12 @@ namespace libtorrent
void start_dht();
void stop_dht();
void start_dht(entry const& startup_state);
bool has_dht() const TORRENT_OVERRIDE TORRENT_FINAL;
bool has_dht() const TORRENT_OVERRIDE;
// this is called for torrents when they are started
// it will prioritize them for announcing to
// the DHT, to get the initial peers quickly
void prioritize_dht(boost::weak_ptr<torrent> t) TORRENT_OVERRIDE TORRENT_FINAL;
void prioritize_dht(boost::weak_ptr<torrent> t) TORRENT_OVERRIDE;
void get_immutable_callback(sha1_hash target
, dht::item const& i);
@ -339,9 +339,9 @@ namespace libtorrent
#if !defined(TORRENT_DISABLE_ENCRYPTION) && !defined(TORRENT_DISABLE_EXTENSIONS)
torrent const* find_encrypted_torrent(
sha1_hash const& info_hash, sha1_hash const& xor_mask);
sha1_hash const& info_hash, sha1_hash const& xor_mask) TORRENT_OVERRIDE;
void add_obfuscated_hash(sha1_hash const& obfuscated, boost::weak_ptr<torrent> const& t);
void add_obfuscated_hash(sha1_hash const& obfuscated, boost::weak_ptr<torrent> const& t) TORRENT_OVERRIDE;
#endif
void on_port_map_log(char const* msg, int map_transport);
@ -356,8 +356,8 @@ namespace libtorrent
void on_port_mapping(int mapping, address const& ip, int port
, error_code const& ec, int nat_transport);
bool is_aborted() const { return m_abort; }
bool is_paused() const { return m_paused; }
bool is_aborted() const TORRENT_OVERRIDE { return m_abort; }
bool is_paused() const TORRENT_OVERRIDE { return m_paused; }
void pause();
void resume();
@ -366,22 +366,22 @@ namespace libtorrent
ip_filter const& get_ip_filter();
void set_port_filter(port_filter const& f);
port_filter const& get_port_filter() const TORRENT_OVERRIDE TORRENT_FINAL;
void ban_ip(address addr) TORRENT_OVERRIDE TORRENT_FINAL;
port_filter const& get_port_filter() const TORRENT_OVERRIDE;
void ban_ip(address addr) TORRENT_OVERRIDE;
void queue_tracker_request(tracker_request& req
, boost::weak_ptr<request_callback> c);
, boost::weak_ptr<request_callback> c) TORRENT_OVERRIDE;
// ==== peer class operations ====
// implements session_interface
void set_peer_classes(peer_class_set* s, address const& a, int st);
peer_class_pool const& peer_classes() const { return m_classes; }
peer_class_pool& peer_classes() { return m_classes; }
bool ignore_unchoke_slots_set(peer_class_set const& set) const;
void set_peer_classes(peer_class_set* s, address const& a, int st) TORRENT_OVERRIDE;
peer_class_pool const& peer_classes() const TORRENT_OVERRIDE { return m_classes; }
peer_class_pool& peer_classes() TORRENT_OVERRIDE { return m_classes; }
bool ignore_unchoke_slots_set(peer_class_set const& set) const TORRENT_OVERRIDE;
int copy_pertinent_channels(peer_class_set const& set
, int channel, bandwidth_channel** dst, int max);
int use_quota_overhead(peer_class_set& set, int amount_down, int amount_up);
, int channel, bandwidth_channel** dst, int max) TORRENT_OVERRIDE;
int use_quota_overhead(peer_class_set& set, int amount_down, int amount_up) TORRENT_OVERRIDE;
bool use_quota_overhead(bandwidth_channel* ch, int amount);
int create_peer_class(char const* name);
@ -407,8 +407,8 @@ namespace libtorrent
void async_add_torrent(add_torrent_params* params);
void on_async_load_torrent(disk_io_job const* j);
void remove_torrent(torrent_handle const& h, int options);
void remove_torrent_impl(boost::shared_ptr<torrent> tptr, int options);
void remove_torrent(torrent_handle const& h, int options) TORRENT_OVERRIDE;
void remove_torrent_impl(boost::shared_ptr<torrent> tptr, int options) TORRENT_OVERRIDE;
void get_torrent_status(std::vector<torrent_status>* ret
, boost::function<bool(torrent_status const&)> const& pred
@ -445,7 +445,7 @@ namespace libtorrent
int max_uploads() const;
#endif
bandwidth_manager* get_bandwidth_manager(int channel);
bandwidth_manager* get_bandwidth_manager(int channel) TORRENT_OVERRIDE;
int upload_rate_limit(peer_class_t c) const;
int download_rate_limit(peer_class_t c) const;
@ -455,19 +455,19 @@ namespace libtorrent
void set_rate_limit(peer_class_t c, int channel, int limit);
int rate_limit(peer_class_t c, int channel) const;
bool preemptive_unchoke() const;
int num_uploads() const
bool preemptive_unchoke() const TORRENT_OVERRIDE;
int num_uploads() const TORRENT_OVERRIDE
{ return int(m_stats_counters[counters::num_peers_up_unchoked]); }
int num_connections() const { return int(m_connections.size()); }
int num_connections() const TORRENT_OVERRIDE { return int(m_connections.size()); }
int peak_up_rate() const { return m_peak_up_rate; }
void trigger_unchoke()
void trigger_unchoke() TORRENT_OVERRIDE
{
TORRENT_ASSERT(is_single_thread());
m_unchoke_time_scaler = 0;
}
void trigger_optimistic_unchoke()
void trigger_optimistic_unchoke() TORRENT_OVERRIDE
{
TORRENT_ASSERT(is_single_thread());
m_optimistic_unchoke_time_scaler = 0;
@ -480,35 +480,35 @@ namespace libtorrent
void set_peer_id(peer_id const& id);
void set_key(int key);
address listen_address() const;
boost::uint16_t listen_port() const;
boost::uint16_t ssl_listen_port() const;
boost::uint16_t listen_port() const TORRENT_OVERRIDE;
boost::uint16_t ssl_listen_port() const TORRENT_OVERRIDE;
alert_manager& alerts() { return m_alerts; }
disk_interface& disk_thread() { return m_disk_thread; }
alert_manager& alerts() TORRENT_OVERRIDE { return m_alerts; }
disk_interface& disk_thread() TORRENT_OVERRIDE { return m_disk_thread; }
void abort();
void abort_stage2();
torrent_handle find_torrent_handle(sha1_hash const& info_hash);
void announce_lsd(sha1_hash const& ih, int port, bool broadcast = false);
void announce_lsd(sha1_hash const& ih, int port, bool broadcast = false) TORRENT_OVERRIDE;
void save_state(entry* e, boost::uint32_t flags) const;
void load_state(bdecode_node const* e);
bool has_connection(peer_connection* p) const;
void insert_peer(boost::shared_ptr<peer_connection> const& c);
bool has_connection(peer_connection* p) const TORRENT_OVERRIDE;
void insert_peer(boost::shared_ptr<peer_connection> const& c) TORRENT_OVERRIDE;
proxy_settings proxy() const;
proxy_settings proxy() const TORRENT_OVERRIDE;
#ifndef TORRENT_DISABLE_DHT
bool is_dht_running() const { return (m_dht.get() != NULL); }
int external_udp_port() const { return m_external_udp_port; }
int external_udp_port() const TORRENT_OVERRIDE { return m_external_udp_port; }
#endif
#if TORRENT_USE_I2P
char const* i2p_session() const { return m_i2p_conn.session_id(); }
proxy_settings i2p_proxy() const;
char const* i2p_session() const TORRENT_OVERRIDE { return m_i2p_conn.session_id(); }
proxy_settings i2p_proxy() const TORRENT_OVERRIDE;
void on_i2p_open(error_code const& ec);
void open_new_incoming_i2p_connection();
@ -535,59 +535,59 @@ namespace libtorrent
// t is the least recently used, then the next least recently
// used is picked
// returns true if the torrent was loaded successfully
bool load_torrent(torrent* t);
bool load_torrent(torrent* t) TORRENT_OVERRIDE;
// bump t to the top of the list of least recently used. i.e.
// make it the most recently used. This is done every time
// an action is performed that required the torrent to be
// loaded, indicating activity
void bump_torrent(torrent* t, bool back = true);
void bump_torrent(torrent* t, bool back = true) TORRENT_OVERRIDE;
// evict torrents until there's space for one new torrent,
void evict_torrents_except(torrent* ignore);
void evict_torrent(torrent* t);
void evict_torrent(torrent* t) TORRENT_OVERRIDE;
void deferred_submit_jobs();
void deferred_submit_jobs() TORRENT_OVERRIDE;
char* allocate_buffer();
char* allocate_buffer() TORRENT_OVERRIDE;
torrent_peer* allocate_peer_entry(int type);
void free_peer_entry(torrent_peer* p);
void free_buffer(char* buf);
int send_buffer_size() const { return send_buffer_size_impl; }
void free_buffer(char* buf) TORRENT_OVERRIDE;
int send_buffer_size() const TORRENT_OVERRIDE { return send_buffer_size_impl; }
// implements buffer_allocator_interface
void free_disk_buffer(char* buf);
char* allocate_disk_buffer(char const* category);
void free_disk_buffer(char* buf) TORRENT_OVERRIDE;
char* allocate_disk_buffer(char const* category) TORRENT_OVERRIDE;
char* allocate_disk_buffer(bool& exceeded
, boost::shared_ptr<disk_observer> o
, char const* category);
, char const* category) TORRENT_OVERRIDE;
char* async_allocate_disk_buffer(char const* category
, boost::function<void(char*)> const& handler);
void reclaim_block(block_cache_reference ref);
, boost::function<void(char*)> const& handler) TORRENT_OVERRIDE;
void reclaim_block(block_cache_reference ref) TORRENT_OVERRIDE;
bool exceeded_cache_use() const
{ return m_disk_thread.exceeded_cache_use(); }
// implements dht_observer
virtual void set_external_address(address const& ip
, address const& source) TORRENT_OVERRIDE TORRENT_FINAL;
virtual address external_address() TORRENT_OVERRIDE TORRENT_FINAL;
virtual void get_peers(sha1_hash const& ih) TORRENT_OVERRIDE TORRENT_FINAL;
virtual void announce(sha1_hash const& ih, address const& addr, int port) TORRENT_OVERRIDE TORRENT_FINAL;
, address const& source) TORRENT_OVERRIDE;
virtual address external_address() TORRENT_OVERRIDE;
virtual void get_peers(sha1_hash const& ih) TORRENT_OVERRIDE;
virtual void announce(sha1_hash const& ih, address const& addr, int port) TORRENT_OVERRIDE;
virtual void outgoing_get_peers(sha1_hash const& target
, sha1_hash const& sent_target, udp::endpoint const& ep) TORRENT_OVERRIDE TORRENT_FINAL;
, sha1_hash const& sent_target, udp::endpoint const& ep) TORRENT_OVERRIDE;
virtual void log(libtorrent::dht::dht_logger::module_t m, char const* fmt, ...)
TORRENT_OVERRIDE TORRENT_FINAL TORRENT_FORMAT(3,4);
TORRENT_OVERRIDE TORRENT_FORMAT(3,4);
virtual void log_packet(message_direction_t dir, char const* pkt, int len
, udp::endpoint node) TORRENT_OVERRIDE TORRENT_FINAL;
, udp::endpoint node) TORRENT_OVERRIDE;
virtual bool on_dht_request(char const* query, int query_len
, dht::msg const& request, entry& response);
, dht::msg const& request, entry& response) TORRENT_OVERRIDE;
void set_external_address(address const& ip
, int source_type, address const& source);
virtual external_ip const& external_address() const TORRENT_OVERRIDE TORRENT_FINAL;
, int source_type, address const& source) TORRENT_OVERRIDE;
virtual external_ip const& external_address() const TORRENT_OVERRIDE;
// used when posting synchronous function
// calls to session_impl and torrent objects
@ -596,26 +596,27 @@ namespace libtorrent
// cork a peer and schedule a delayed uncork
// does nothing if the peer is already corked
void cork_burst(peer_connection* p);
void cork_burst(peer_connection* p) TORRENT_OVERRIDE;
// uncork all peers added to the delayed uncork queue
// implements uncork_interface
virtual void do_delayed_uncork() TORRENT_OVERRIDE TORRENT_FINAL;
virtual void do_delayed_uncork() TORRENT_OVERRIDE;
void post_socket_job(socket_job& j);
void post_socket_job(socket_job& j) TORRENT_OVERRIDE;
// implements session_interface
virtual tcp::endpoint bind_outgoing_socket(socket_type& s, address
const& remote_address, error_code& ec) const;
const& remote_address, error_code& ec) const TORRENT_OVERRIDE;
virtual bool verify_bound_address(address const& addr, bool utp
, error_code& ec);
, error_code& ec) TORRENT_OVERRIDE;
bool has_lsd() const { return m_lsd.get() != NULL; }
bool has_lsd() const TORRENT_OVERRIDE { return m_lsd.get() != NULL; }
std::vector<block_info>& block_info_storage() { return m_block_info_storage; }
std::vector<block_info>& block_info_storage() TORRENT_OVERRIDE { return m_block_info_storage; }
libtorrent::utp_socket_manager* utp_socket_manager() { return &m_utp_socket_manager; }
void inc_boost_connections() { ++m_boost_connections; }
libtorrent::utp_socket_manager* utp_socket_manager() TORRENT_OVERRIDE
{ return &m_utp_socket_manager; }
void inc_boost_connections() TORRENT_OVERRIDE { ++m_boost_connections; }
#ifndef TORRENT_NO_DEPRECATE
// the time when the next rss feed needs updating
@ -667,7 +668,7 @@ namespace libtorrent
#endif
void update_alert_mask();
void trigger_auto_manage();
void trigger_auto_manage() TORRENT_OVERRIDE;
private:
@ -682,7 +683,7 @@ namespace libtorrent
void on_trigger_auto_manage();
void on_lsd_peer(tcp::endpoint peer, sha1_hash const& ih);
void setup_socket_buffers(socket_type& s);
void setup_socket_buffers(socket_type& s) TORRENT_OVERRIDE;
// the settings for the client
aux::session_settings m_settings;
@ -953,11 +954,11 @@ namespace libtorrent
stat m_stat;
// implements session_interface
virtual void sent_bytes(int bytes_payload, int bytes_protocol);
virtual void received_bytes(int bytes_payload, int bytes_protocol);
virtual void trancieve_ip_packet(int bytes, bool ipv6);
virtual void sent_syn(bool ipv6);
virtual void received_synack(bool ipv6);
virtual void sent_bytes(int bytes_payload, int bytes_protocol) TORRENT_OVERRIDE;
virtual void received_bytes(int bytes_payload, int bytes_protocol) TORRENT_OVERRIDE;
virtual void trancieve_ip_packet(int bytes, bool ipv6) TORRENT_OVERRIDE;
virtual void sent_syn(bool ipv6) TORRENT_OVERRIDE;
virtual void received_synack(bool ipv6) TORRENT_OVERRIDE;
int m_peak_up_rate;
int m_peak_down_rate;
@ -975,7 +976,8 @@ namespace libtorrent
void recalculate_optimistic_unchoke_slots();
time_point m_created;
boost::int64_t session_time() const { return total_seconds(aux::time_now() - m_created); }
boost::int64_t session_time() const TORRENT_OVERRIDE
{ return total_seconds(aux::time_now() - m_created); }
time_point m_last_tick;
time_point m_last_second_tick;
@ -1023,7 +1025,7 @@ namespace libtorrent
#endif
bool incoming_packet(error_code const& ec
, udp::endpoint const&, char const* buf, int size);
, udp::endpoint const&, char const* buf, int size) TORRENT_OVERRIDE;
// see m_external_listen_port. This is the same
// but for the udp port used by the DHT.
@ -1127,10 +1129,10 @@ namespace libtorrent
void check_invariant() const;
#endif
counters& stats_counters() { return m_stats_counters; }
counters& stats_counters() TORRENT_OVERRIDE { return m_stats_counters; }
void received_buffer(int size);
void sent_buffer(int size);
void received_buffer(int size) TORRENT_OVERRIDE;
void sent_buffer(int size) TORRENT_OVERRIDE;
// each second tick the timer takes a little
// bit longer than one second to trigger. The
@ -1143,8 +1145,8 @@ namespace libtorrent
boost::uint16_t m_tick_residual;
#ifndef TORRENT_DISABLE_LOGGING
virtual void session_log(char const* fmt, ...) const TORRENT_OVERRIDE TORRENT_FINAL TORRENT_FORMAT(2,3);
virtual void session_vlog(char const* fmt, va_list& va) const TORRENT_OVERRIDE TORRENT_FINAL TORRENT_FORMAT(2,0);
virtual void session_log(char const* fmt, ...) const TORRENT_OVERRIDE TORRENT_FORMAT(2,3);
virtual void session_vlog(char const* fmt, va_list& va) const TORRENT_OVERRIDE TORRENT_FORMAT(2,0);
// this list of tracker loggers serves as tracker_callbacks when
// shutting down. This list is just here to keep them alive during
@ -1154,8 +1156,8 @@ namespace libtorrent
// TODO: 2 the throttling of saving resume data could probably be
// factored out into a separate class
virtual void queue_async_resume_data(boost::shared_ptr<torrent> const& t) TORRENT_OVERRIDE TORRENT_FINAL;
virtual void done_async_resume() TORRENT_OVERRIDE TORRENT_FINAL;
virtual void queue_async_resume_data(boost::shared_ptr<torrent> const& t) TORRENT_OVERRIDE;
virtual void done_async_resume() TORRENT_OVERRIDE;
void async_resume_dispatched();
// state for keeping track of external IPs

2
include/libtorrent/aux_/session_interface.hpp
View File

@ -276,8 +276,6 @@ namespace libtorrent { namespace aux
virtual void sent_syn(bool ipv6) = 0;
virtual void received_synack(bool ipv6) = 0;
virtual int peak_up_rate() const = 0;
enum torrent_list_index
{
// this is the set of (subscribed) torrents that have changed

5
include/libtorrent/config.hpp
View File

@ -33,6 +33,8 @@ POSSIBILITY OF SUCH DAMAGE.
#ifndef TORRENT_CONFIG_HPP_INCLUDED
#define TORRENT_CONFIG_HPP_INCLUDED
#include "libtorrent/aux_/disable_warnings_push.hpp"
#define _FILE_OFFSET_BITS 64
#if !defined _MSC_VER || _MSC_VER >= 1600
@ -44,6 +46,7 @@ POSSIBILITY OF SUCH DAMAGE.
#endif
#endif
#include <boost/config.hpp>
#include <boost/asio/detail/config.hpp>
#include <boost/version.hpp>
@ -87,6 +90,8 @@ POSSIBILITY OF SUCH DAMAGE.
#endif
#endif
#include "libtorrent/aux_/disable_warnings_pop.hpp"
// ======= GCC =========
#if defined __GNUC__

4
include/libtorrent/http_seed_connection.hpp
View File

@ -88,7 +88,7 @@ namespace libtorrent
virtual void on_receive(error_code const& error
, std::size_t bytes_transferred) TORRENT_OVERRIDE;
std::string const& url() const { return m_url; }
std::string const& url() const TORRENT_OVERRIDE { return m_url; }
virtual void get_specific_peer_info(peer_info& p) const TORRENT_OVERRIDE;
virtual void disconnect(error_code const& ec, operation_t op, int error = 0) TORRENT_OVERRIDE;
@ -102,7 +102,7 @@ namespace libtorrent
// block. If the peer isn't downloading
// a piece for the moment, the boost::optional
// will be invalid.
boost::optional<piece_block_progress> downloading_piece_progress() const;
boost::optional<piece_block_progress> downloading_piece_progress() const TORRENT_OVERRIDE;
// this is const since it's used as a key in the web seed list in the torrent
// if it's changed referencing back into that list will fail

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

@ -34,7 +34,10 @@ POSSIBILITY OF SUCH DAMAGE.
#include <algorithm>
#include "libtorrent/aux_/disable_warnings_push.hpp"
#include <boost/cstdint.hpp>
#include "libtorrent/aux_/disable_warnings_pop.hpp"
#include "libtorrent/config.hpp"
#include "libtorrent/peer_id.hpp"
#include "libtorrent/assert.hpp"

6
include/libtorrent/kademlia/put_data.hpp
View File

@ -57,7 +57,7 @@ struct put_data: traversal_algorithm
put_data(node& node, put_callback const& callback);
virtual char const* name() const;
virtual char const* name() const TORRENT_OVERRIDE;
virtual void start() TORRENT_OVERRIDE;
void set_data(item const& data) { m_data = data; }
@ -66,8 +66,8 @@ struct put_data: traversal_algorithm
protected:
virtual void done();
virtual bool invoke(observer_ptr o);
virtual void done() TORRENT_OVERRIDE;
virtual bool invoke(observer_ptr o) TORRENT_OVERRIDE;
put_callback m_put_callback;
item m_data;

4
include/libtorrent/pe_crypto.hpp
View File

@ -46,9 +46,13 @@ struct rc4 {
void TORRENT_EXTRA_EXPORT rc4_init(const unsigned char* in, unsigned long len, rc4 *state);
unsigned long TORRENT_EXTRA_EXPORT rc4_encrypt(unsigned char *out, unsigned long outlen, rc4 *state);
#include "libtorrent/aux_/disable_warnings_push.hpp"
#include <boost/asio/buffer.hpp>
#include <list>
#include "libtorrent/aux_/disable_warnings_pop.hpp"
#include "libtorrent/receive_buffer.hpp"
#include "libtorrent/peer_id.hpp" // For sha1_hash
#include "libtorrent/extensions.hpp"

5
include/libtorrent/stat_cache.hpp
View File

@ -33,9 +33,14 @@ POSSIBILITY OF SUCH DAMAGE.
#ifndef TORRENT_STAT_CACHE_HPP
#define TORRENT_STAT_CACHE_HPP
#include "libtorrent/aux_/disable_warnings_push.hpp"
#include <time.h>
#include <vector>
#include <boost/cstdint.hpp>
#include "libtorrent/aux_/disable_warnings_pop.hpp"
#include "libtorrent/config.hpp"
namespace libtorrent

5
include/libtorrent/timestamp_history.hpp
View File

@ -33,7 +33,10 @@ POSSIBILITY OF SUCH DAMAGE.
#ifndef TIMESTAMP_HISTORY_HPP
#define TIMESTAMP_HISTORY_HPP
#include "boost/cstdint.hpp"
#include "libtorrent/aux_/disable_warnings_push.hpp"
#include <boost/cstdint.hpp>
#include "libtorrent/aux_/disable_warnings_pop.hpp"
#include "libtorrent/config.hpp"
#include "libtorrent/assert.hpp"

2
include/libtorrent/web_peer_connection.hpp
View File

@ -84,7 +84,7 @@ namespace libtorrent
virtual void on_receive(error_code const& error
, std::size_t bytes_transferred) TORRENT_OVERRIDE;
std::string const& url() const { return m_url; }
std::string const& url() const TORRENT_OVERRIDE { return m_url; }
virtual void get_specific_peer_info(peer_info& p) const TORRENT_OVERRIDE;
virtual void disconnect(error_code const& ec

11
src/pe_crypto.cpp
View File

@ -32,21 +32,16 @@ POSSIBILITY OF SUCH DAMAGE.
#if !defined(TORRENT_DISABLE_ENCRYPTION) && !defined(TORRENT_DISABLE_EXTENSIONS)
#include "libtorrent/aux_/disable_warnings_push.hpp"
#include <boost/cstdint.hpp>
#include <algorithm>
#ifdef __GNUC__
#pragma GCC diagnostic push
#pragma GCC diagnostic ignored "-Wlong-long"
#endif
extern "C" {
#include "libtorrent/tommath.h"
}
#ifdef __GNUC__
#pragma GCC diagnostic pop
#endif
#include "libtorrent/aux_/disable_warnings_pop.hpp"
#include "libtorrent/random.hpp"
#include "libtorrent/pe_crypto.hpp"