From d2e874fca8af9cf9a09f3a9a9080e1e5a66eb974 Mon Sep 17 00:00:00 2001 From: Alden Torres Date: Tue, 6 Feb 2018 02:32:19 -0500 Subject: [PATCH] headers code cleanup, removed unused fields in torrent class (#2775) --- include/libtorrent/flags.hpp | 1 - include/libtorrent/torrent.hpp | 13 ++----------- include/libtorrent/torrent_info.hpp | 2 +- src/torrent.cpp | 2 -- 4 files changed, 3 insertions(+), 15 deletions(-) diff --git a/include/libtorrent/flags.hpp b/include/libtorrent/flags.hpp index 2c14bc303..679b8704f 100644 --- a/include/libtorrent/flags.hpp +++ b/include/libtorrent/flags.hpp @@ -136,4 +136,3 @@ private: } // libtorrent #endif - diff --git a/include/libtorrent/torrent.hpp b/include/libtorrent/torrent.hpp index 904860717..f0466adf2 100644 --- a/include/libtorrent/torrent.hpp +++ b/include/libtorrent/torrent.hpp @@ -109,7 +109,6 @@ namespace libtorrent { struct add_torrent_params; struct storage_interface; class bt_peer_connection; - struct listen_socket_t; peer_id generate_peer_id(aux::session_settings const& sett); @@ -600,7 +599,7 @@ namespace libtorrent { int priority() const; #ifndef TORRENT_NO_DEPRECATE - void set_priority(int const prio); + void set_priority(int prio); #endif // TORRENT_NO_DEPRECATE // -------------------------------------------- @@ -1173,7 +1172,7 @@ namespace libtorrent { void on_storage_moved(status_t status, std::string const& path , storage_error const& error); void on_file_renamed(std::string const& filename - , file_index_t const file_idx + , file_index_t file_idx , storage_error const& error); void on_cache_flushed(); @@ -1188,8 +1187,6 @@ namespace libtorrent { int prioritize_tracker(int tracker_index); int deprioritize_tracker(int tracker_index); - bool request_bandwidth_from_session(int channel) const; - void update_peer_interest(bool was_finished); void prioritize_udp_trackers(); @@ -1610,12 +1607,6 @@ namespace libtorrent { // the DHT bool m_announce_to_dht:1; - // these represent whether or not this torrent is counted - // in the total counters of active seeds and downloads - // in the session. - bool m_is_active_download:1; - bool m_is_active_finished:1; - // even if we're not built to support SSL torrents, // remember that this is an SSL torrent, so that we don't // accidentally start seeding it without any authentication. diff --git a/include/libtorrent/torrent_info.hpp b/include/libtorrent/torrent_info.hpp index d38e3a6e2..5820c9f32 100644 --- a/include/libtorrent/torrent_info.hpp +++ b/include/libtorrent/torrent_info.hpp @@ -163,7 +163,7 @@ namespace libtorrent { explicit torrent_info(span buffer, from_span_t); explicit torrent_info(std::string const& filename); #endif // BOOST_NO_EXCEPTIONS - explicit torrent_info(torrent_info const& t); + torrent_info(torrent_info const& t); explicit torrent_info(sha1_hash const& info_hash); torrent_info(bdecode_node const& torrent_file, error_code& ec); torrent_info(char const* buffer, int size, error_code& ec) diff --git a/src/torrent.cpp b/src/torrent.cpp index 0d73425d7..e7522644e 100644 --- a/src/torrent.cpp +++ b/src/torrent.cpp @@ -200,8 +200,6 @@ namespace libtorrent { , m_padding(0) , m_incomplete(0xffffff) , m_announce_to_dht(!(p.flags & torrent_flags::paused)) - , m_is_active_download(false) - , m_is_active_finished(false) , m_ssl_torrent(false) , m_deleted(false) , m_auto_managed(p.flags & torrent_flags::auto_managed)