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

fix warnings

This commit is contained in:
Arvid Norberg 2015-05-16 07:21:23 +00:00
parent 2bf4519bee
commit 259e094316
3 changed files with 33 additions and 33 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

52
include/libtorrent/alert_types.hpp
View File

@ -75,7 +75,7 @@ namespace libtorrent
{ {
// internal // internal
torrent_alert(aux::stack_allocator& alloc, torrent_handle const& h); torrent_alert(aux::stack_allocator& alloc, torrent_handle const& h);
// internal // internal
static const int alert_type = 0; static const int alert_type = 0;
virtual std::string message() const; virtual std::string message() const;
@ -605,7 +605,7 @@ namespace libtorrent
// 3. Stopped // 3. Stopped
int event; int event;
}; };
// This alert is generated when a finished piece fails its hash check. You can get the handle // This alert is generated when a finished piece fails its hash check. You can get the handle
// to the torrent which got the failed piece and the index of the piece itself from the alert. // to the torrent which got the failed piece and the index of the piece itself from the alert.
struct TORRENT_EXPORT hash_failed_alert: torrent_alert struct TORRENT_EXPORT hash_failed_alert: torrent_alert
@ -897,7 +897,7 @@ namespace libtorrent
// internal // internal
storage_moved_alert(aux::stack_allocator& alloc storage_moved_alert(aux::stack_allocator& alloc
, torrent_handle const& h, std::string const& p); , torrent_handle const& h, std::string const& p);
TORRENT_DEFINE_ALERT(storage_moved_alert, 33) TORRENT_DEFINE_ALERT(storage_moved_alert, 33)
static const int static_category = alert::storage_notification; static const int static_category = alert::storage_notification;
@ -924,7 +924,7 @@ namespace libtorrent
, error_code const& e , error_code const& e
, std::string const& file , std::string const& file
, char const* op); , char const* op);
TORRENT_DEFINE_ALERT(storage_moved_failed_alert, 34) TORRENT_DEFINE_ALERT(storage_moved_failed_alert, 34)
static const int static_category = alert::storage_notification; static const int static_category = alert::storage_notification;
@ -961,7 +961,7 @@ namespace libtorrent
// internal // internal
torrent_deleted_alert(aux::stack_allocator& alloc torrent_deleted_alert(aux::stack_allocator& alloc
, torrent_handle const& h, sha1_hash const& ih); , torrent_handle const& h, sha1_hash const& ih);
TORRENT_DEFINE_ALERT_PRIO(torrent_deleted_alert, 35) TORRENT_DEFINE_ALERT_PRIO(torrent_deleted_alert, 35)
static const int static_category = alert::storage_notification; static const int static_category = alert::storage_notification;
@ -981,7 +981,7 @@ namespace libtorrent
// internal // internal
torrent_delete_failed_alert(aux::stack_allocator& alloc torrent_delete_failed_alert(aux::stack_allocator& alloc
, torrent_handle const& h, error_code const& e, sha1_hash const& ih); , torrent_handle const& h, error_code const& e, sha1_hash const& ih);
TORRENT_DEFINE_ALERT_PRIO(torrent_delete_failed_alert, 36) TORRENT_DEFINE_ALERT_PRIO(torrent_delete_failed_alert, 36)
static const int static_category = alert::storage_notification static const int static_category = alert::storage_notification
@ -1011,7 +1011,7 @@ namespace libtorrent
save_resume_data_alert(aux::stack_allocator& alloc save_resume_data_alert(aux::stack_allocator& alloc
, boost::shared_ptr<entry> const& rd , boost::shared_ptr<entry> const& rd
, torrent_handle const& h); , torrent_handle const& h);
TORRENT_DEFINE_ALERT_PRIO(save_resume_data_alert, 37) TORRENT_DEFINE_ALERT_PRIO(save_resume_data_alert, 37)
static const int static_category = alert::storage_notification; static const int static_category = alert::storage_notification;
@ -1032,7 +1032,7 @@ namespace libtorrent
// internal // internal
save_resume_data_failed_alert(aux::stack_allocator& alloc save_resume_data_failed_alert(aux::stack_allocator& alloc
, torrent_handle const& h, error_code const& e); , torrent_handle const& h, error_code const& e);
TORRENT_DEFINE_ALERT_PRIO(save_resume_data_failed_alert, 38) TORRENT_DEFINE_ALERT_PRIO(save_resume_data_failed_alert, 38)
static const int static_category = alert::storage_notification static const int static_category = alert::storage_notification
@ -1058,7 +1058,7 @@ namespace libtorrent
{ {
// internal // internal
torrent_paused_alert(aux::stack_allocator& alloc, torrent_handle const& h); torrent_paused_alert(aux::stack_allocator& alloc, torrent_handle const& h);
TORRENT_DEFINE_ALERT(torrent_paused_alert, 39) TORRENT_DEFINE_ALERT(torrent_paused_alert, 39)
static const int static_category = alert::status_notification; static const int static_category = alert::status_notification;
@ -1146,7 +1146,7 @@ namespace libtorrent
| alert::error_notification | alert::error_notification
| alert::storage_notification; | alert::storage_notification;
virtual std::string message() const; virtual std::string message() const;
#ifndef TORRENT_NO_DEPRECATE #ifndef TORRENT_NO_DEPRECATE
// the path to the file that was accessed when the error occurred. // the path to the file that was accessed when the error occurred.
std::string file; std::string file;
@ -1185,7 +1185,7 @@ namespace libtorrent
// what's returned from lazy_bdecode(). // what's returned from lazy_bdecode().
error_code error; error_code error;
}; };
// This alert is generated when the metadata has been completely received and the torrent // This alert is generated when the metadata has been completely received and the torrent
// can start downloading. It is not generated on torrents that are started with metadata, but // can start downloading. It is not generated on torrents that are started with metadata, but
// only those that needs to download it from peers (when utilizing the libtorrent extension). // only those that needs to download it from peers (when utilizing the libtorrent extension).
@ -1483,7 +1483,7 @@ namespace libtorrent
// internal // internal
peer_blocked_alert(aux::stack_allocator& alloc, torrent_handle const& h peer_blocked_alert(aux::stack_allocator& alloc, torrent_handle const& h
, address const& i, int r); , address const& i, int r);
TORRENT_DEFINE_ALERT(peer_blocked_alert, 54) TORRENT_DEFINE_ALERT(peer_blocked_alert, 54)
static const int static_category = alert::ip_block_notification; static const int static_category = alert::ip_block_notification;
@ -1513,7 +1513,7 @@ namespace libtorrent
// internal // internal
dht_announce_alert(aux::stack_allocator& alloc, address const& i, int p dht_announce_alert(aux::stack_allocator& alloc, address const& i, int p
, sha1_hash const& ih); , sha1_hash const& ih);
TORRENT_DEFINE_ALERT(dht_announce_alert, 55) TORRENT_DEFINE_ALERT(dht_announce_alert, 55)
static const int static_category = alert::dht_notification; static const int static_category = alert::dht_notification;
@ -1678,7 +1678,7 @@ namespace libtorrent
{ {
// internal // internal
dht_bootstrap_alert(aux::stack_allocator& alloc); dht_bootstrap_alert(aux::stack_allocator& alloc);
TORRENT_DEFINE_ALERT(dht_bootstrap_alert, 62) TORRENT_DEFINE_ALERT(dht_bootstrap_alert, 62)
static const int static_category = alert::dht_notification; static const int static_category = alert::dht_notification;
@ -1747,7 +1747,7 @@ namespace libtorrent
// specifies which error the torrent encountered. // specifies which error the torrent encountered.
error_code error; error_code error;
#ifndef TORRENT_NO_DEPRECATE #ifndef TORRENT_NO_DEPRECATE
// the filename (or object) the error occurred on. // the filename (or object) the error occurred on.
std::string error_file; std::string error_file;
@ -1869,7 +1869,7 @@ namespace libtorrent
// by it, for efficient updates. // by it, for efficient updates.
std::vector<torrent_status> status; std::vector<torrent_status> status;
}; };
struct TORRENT_EXPORT mmap_cache_alert : alert struct TORRENT_EXPORT mmap_cache_alert : alert
{ {
mmap_cache_alert(aux::stack_allocator& alloc mmap_cache_alert(aux::stack_allocator& alloc
@ -1963,7 +1963,7 @@ namespace libtorrent
{ {
// internal // internal
dht_error_alert(aux::stack_allocator& alloc, int op, error_code const& ec); dht_error_alert(aux::stack_allocator& alloc, int op, error_code const& ec);
TORRENT_DEFINE_ALERT(dht_error_alert, 73) TORRENT_DEFINE_ALERT(dht_error_alert, 73)
static const int static_category = alert::error_notification static const int static_category = alert::error_notification
@ -1989,7 +1989,7 @@ namespace libtorrent
{ {
dht_immutable_item_alert(aux::stack_allocator& alloc, sha1_hash const& t dht_immutable_item_alert(aux::stack_allocator& alloc, sha1_hash const& t
, entry const& i); , entry const& i);
TORRENT_DEFINE_ALERT_PRIO(dht_immutable_item_alert, 74) TORRENT_DEFINE_ALERT_PRIO(dht_immutable_item_alert, 74)
static const int static_category = alert::error_notification static const int static_category = alert::error_notification
@ -2018,7 +2018,7 @@ namespace libtorrent
, boost::uint64_t sequence , boost::uint64_t sequence
, std::string const& s , std::string const& s
, entry const& i); , entry const& i);
TORRENT_DEFINE_ALERT_PRIO(dht_mutable_item_alert, 75) TORRENT_DEFINE_ALERT_PRIO(dht_mutable_item_alert, 75)
static const int static_category = alert::error_notification static const int static_category = alert::error_notification
@ -2124,7 +2124,7 @@ namespace libtorrent
{ {
// internal // internal
log_alert(aux::stack_allocator& alloc, char const* log); log_alert(aux::stack_allocator& alloc, char const* log);
TORRENT_DEFINE_ALERT(log_alert, 79) TORRENT_DEFINE_ALERT(log_alert, 79)
static const int static_category = alert::session_log_notification; static const int static_category = alert::session_log_notification;
@ -2147,7 +2147,7 @@ namespace libtorrent
// internal // internal
torrent_log_alert(aux::stack_allocator& alloc, torrent_handle h torrent_log_alert(aux::stack_allocator& alloc, torrent_handle h
, char const* log); , char const* log);
TORRENT_DEFINE_ALERT(torrent_log_alert, 80) TORRENT_DEFINE_ALERT(torrent_log_alert, 80)
static const int static_category = alert::torrent_log_notification; static const int static_category = alert::torrent_log_notification;
@ -2174,7 +2174,7 @@ namespace libtorrent
outgoing_message, outgoing_message,
incoming, incoming,
outgoing, outgoing,
info, info
}; };
// internal // internal
@ -2182,7 +2182,7 @@ namespace libtorrent
, tcp::endpoint const& i, peer_id const& pi , tcp::endpoint const& i, peer_id const& pi
, peer_log_alert::direction_t dir , peer_log_alert::direction_t dir
, char const* event, char const* log); , char const* event, char const* log);
TORRENT_DEFINE_ALERT(peer_log_alert, 81) TORRENT_DEFINE_ALERT(peer_log_alert, 81)
static const int static_category = alert::peer_log_notification; static const int static_category = alert::peer_log_notification;
@ -2207,7 +2207,7 @@ namespace libtorrent
{ {
// internal // internal
lsd_error_alert(aux::stack_allocator& alloc, error_code const& ec); lsd_error_alert(aux::stack_allocator& alloc, error_code const& ec);
TORRENT_DEFINE_ALERT(lsd_error_alert, 82) TORRENT_DEFINE_ALERT(lsd_error_alert, 82)
static const int static_category = alert::error_notification; static const int static_category = alert::error_notification;
@ -2281,7 +2281,7 @@ namespace libtorrent
dht_stats_alert(aux::stack_allocator& alloc dht_stats_alert(aux::stack_allocator& alloc
, std::vector<dht_routing_bucket> const& table , std::vector<dht_routing_bucket> const& table
, std::vector<dht_lookup> const& requests); , std::vector<dht_lookup> const& requests);
TORRENT_DEFINE_ALERT(dht_stats_alert, 83) TORRENT_DEFINE_ALERT(dht_stats_alert, 83)
static const int static_category = alert::stats_notification; static const int static_category = alert::stats_notification;
@ -2305,7 +2305,7 @@ namespace libtorrent
incoming_request_alert(aux::stack_allocator& alloc incoming_request_alert(aux::stack_allocator& alloc
, peer_request r, torrent_handle h , peer_request r, torrent_handle h
, tcp::endpoint const& ep, peer_id const& peer_id); , tcp::endpoint const& ep, peer_id const& peer_id);
static const int static_category = alert::incoming_request_notification; static const int static_category = alert::incoming_request_notification;
TORRENT_DEFINE_ALERT(incoming_request_alert, 84) TORRENT_DEFINE_ALERT(incoming_request_alert, 84)

2
include/libtorrent/performance_counters.hpp
View File

@ -308,7 +308,7 @@ namespace libtorrent
socket_recv_size19, socket_recv_size19,
socket_recv_size20, socket_recv_size20,
num_stats_counters, num_stats_counters
}; };
// == ALL FOLLOWING ARE GAUGES == // == ALL FOLLOWING ARE GAUGES ==

12
include/libtorrent/tracker_manager.hpp
View File

@ -251,7 +251,7 @@ namespace libtorrent
io_service& get_io_service() { return m_timeout.get_io_service(); } io_service& get_io_service() { return m_timeout.get_io_service(); }
private: private:
void timeout_callback(error_code const&); void timeout_callback(error_code const&);
int m_completion_timeout; int m_completion_timeout;
@ -268,7 +268,7 @@ namespace libtorrent
// the asio async operation // the asio async operation
deadline_timer m_timeout; deadline_timer m_timeout;
int m_read_timeout; int m_read_timeout;
bool m_abort; bool m_abort;
@ -338,7 +338,7 @@ namespace libtorrent
, aux::session_logger& ses , aux::session_logger& ses
#endif #endif
); );
~tracker_manager(); virtual ~tracker_manager();
void queue_request( void queue_request(
io_service& ios io_service& ios
@ -355,13 +355,13 @@ namespace libtorrent
void received_bytes(int bytes); void received_bytes(int bytes);
virtual bool incoming_packet(error_code const& e, udp::endpoint const& ep virtual bool incoming_packet(error_code const& e, udp::endpoint const& ep
, char const* buf, int size); , char const* buf, int size) TORRENT_OVERRIDE;
// this is only used for SOCKS packets, since // this is only used for SOCKS packets, since
// they may be addressed to hostname // they may be addressed to hostname
virtual bool incoming_packet(error_code const& e, char const* hostname virtual bool incoming_packet(error_code const& e, char const* hostname
, char const* buf, int size); , char const* buf, int size) TORRENT_OVERRIDE;
void update_transaction_id( void update_transaction_id(
boost::shared_ptr<udp_tracker_connection> c boost::shared_ptr<udp_tracker_connection> c
, boost::uint64_t tid); , boost::uint64_t tid);