From 8fedfcdce6ee20159847faf655b4e3473b832ac3 Mon Sep 17 00:00:00 2001 From: Alden Torres Date: Tue, 2 Aug 2016 17:58:15 -0400 Subject: [PATCH] more trivial cleanup (#979) --- include/libtorrent/http_seed_connection.hpp | 10 +--------- include/libtorrent/i2p_stream.hpp | 9 +++------ include/libtorrent/web_connection_base.hpp | 22 --------------------- include/libtorrent/web_peer_connection.hpp | 4 ---- include/libtorrent/xml_parse.hpp | 4 ---- src/alert.cpp | 7 ------- src/http_seed_connection.cpp | 13 +----------- src/web_connection_base.cpp | 14 ------------- 8 files changed, 5 insertions(+), 78 deletions(-) diff --git a/include/libtorrent/http_seed_connection.hpp b/include/libtorrent/http_seed_connection.hpp index 327d93297..63b180024 100644 --- a/include/libtorrent/http_seed_connection.hpp +++ b/include/libtorrent/http_seed_connection.hpp @@ -35,23 +35,16 @@ POSSIBILITY OF SUCH DAMAGE. #include #include -#include #include -#include #include -#include "libtorrent/debug.hpp" - #include "libtorrent/aux_/disable_warnings_push.hpp" #include #include "libtorrent/aux_/disable_warnings_pop.hpp" #include "libtorrent/config.hpp" #include "libtorrent/web_connection_base.hpp" -#include "libtorrent/disk_buffer_holder.hpp" -#include "libtorrent/torrent.hpp" #include "libtorrent/piece_block_progress.hpp" -#include "libtorrent/http_parser.hpp" namespace libtorrent { @@ -70,7 +63,7 @@ namespace libtorrent public: // this is the constructor where the we are the active part. - // The peer_conenction should handshake and verify that the + // The peer_connection should handshake and verify that the // other end has the correct id http_seed_connection(peer_connection_args const& pack , web_seed_t& web); @@ -124,4 +117,3 @@ namespace libtorrent } #endif // TORRENT_WEB_PEER_CONNECTION_HPP_INCLUDED - diff --git a/include/libtorrent/i2p_stream.hpp b/include/libtorrent/i2p_stream.hpp index d50bf0b03..efaec67a9 100644 --- a/include/libtorrent/i2p_stream.hpp +++ b/include/libtorrent/i2p_stream.hpp @@ -39,8 +39,6 @@ POSSIBILITY OF SUCH DAMAGE. #include "libtorrent/aux_/disable_warnings_push.hpp" -#include -#include #include #include "libtorrent/aux_/disable_warnings_pop.hpp" @@ -116,7 +114,7 @@ public: // 4 send command message (CONNECT/ACCEPT) // to avoid unnecessary copying of the handler, - // store it in a shaed_ptr + // store it in a shared_ptr boost::shared_ptr h(new handler_type(handler)); using std::placeholders::_1; @@ -186,7 +184,7 @@ public: char const* session_id() const { return m_session_id.c_str(); } std::string const& local_endpoint() const { return m_i2p_local_endpoint; } - typedef boost::function name_lookup_handler; + typedef std::function name_lookup_handler; void async_name_lookup(char const* name, name_lookup_handler handler); private: @@ -213,7 +211,7 @@ private: std::string m_i2p_local_endpoint; std::string m_session_id; - std::list > m_name_lookup; + std::list> m_name_lookup; enum state_t { @@ -244,4 +242,3 @@ struct is_error_condition_enum #endif // TORRENT_USE_I2P #endif - diff --git a/include/libtorrent/web_connection_base.hpp b/include/libtorrent/web_connection_base.hpp index a11fcf2be..516c1f74a 100644 --- a/include/libtorrent/web_connection_base.hpp +++ b/include/libtorrent/web_connection_base.hpp @@ -33,37 +33,16 @@ POSSIBILITY OF SUCH DAMAGE. #ifndef WEB_CONNECTION_BASE_HPP_INCLUDED #define WEB_CONNECTION_BASE_HPP_INCLUDED -#include "libtorrent/debug.hpp" - #include #include -#include #include #include -#include #include -#include "libtorrent/aux_/disable_warnings_push.hpp" -#include -#include -#include -#include -#include "libtorrent/aux_/disable_warnings_pop.hpp" - -#include "libtorrent/buffer.hpp" #include "libtorrent/peer_connection.hpp" -#include "libtorrent/socket.hpp" -#include "libtorrent/peer_id.hpp" -#include "libtorrent/storage.hpp" -#include "libtorrent/stat.hpp" -#include "libtorrent/alert.hpp" -#include "libtorrent/torrent_handle.hpp" #include "libtorrent/torrent.hpp" #include "libtorrent/peer_request.hpp" -#include "libtorrent/piece_block_progress.hpp" #include "libtorrent/config.hpp" -// parse_url -#include "libtorrent/tracker_manager.hpp" #include "libtorrent/http_parser.hpp" namespace libtorrent @@ -156,4 +135,3 @@ namespace libtorrent } #endif // TORRENT_WEB_CONNECTION_BASE_HPP_INCLUDED - diff --git a/include/libtorrent/web_peer_connection.hpp b/include/libtorrent/web_peer_connection.hpp index 7d66d8e15..6aca36a40 100644 --- a/include/libtorrent/web_peer_connection.hpp +++ b/include/libtorrent/web_peer_connection.hpp @@ -38,14 +38,10 @@ POSSIBILITY OF SUCH DAMAGE. #include #include #include -#include #include #include "libtorrent/aux_/disable_warnings_push.hpp" -#include -#include -#include #include #include "libtorrent/aux_/disable_warnings_pop.hpp" diff --git a/include/libtorrent/xml_parse.hpp b/include/libtorrent/xml_parse.hpp index afe143eb4..2975bdda2 100644 --- a/include/libtorrent/xml_parse.hpp +++ b/include/libtorrent/xml_parse.hpp @@ -33,9 +33,6 @@ POSSIBILITY OF SUCH DAMAGE. #ifndef TORRENT_XML_PARSE_HPP #define TORRENT_XML_PARSE_HPP -#include -#include - #include "libtorrent/aux_/disable_warnings_push.hpp" #include @@ -76,4 +73,3 @@ namespace libtorrent #endif - diff --git a/src/alert.cpp b/src/alert.cpp index 6ef9f35a3..ff65777ce 100644 --- a/src/alert.cpp +++ b/src/alert.cpp @@ -37,13 +37,10 @@ POSSIBILITY OF SUCH DAMAGE. #include "libtorrent/config.hpp" #include "libtorrent/alert.hpp" #include "libtorrent/alert_types.hpp" -#include "libtorrent/io_service.hpp" #include "libtorrent/socket_io.hpp" #include "libtorrent/time.hpp" #include "libtorrent/error_code.hpp" -#include "libtorrent/extensions.hpp" #include "libtorrent/torrent.hpp" -#include "libtorrent/aux_/time.hpp" #include "libtorrent/performance_counters.hpp" #include "libtorrent/stack_allocator.hpp" #include "libtorrent/piece_picker.hpp" // for piece_block @@ -52,9 +49,6 @@ POSSIBILITY OF SUCH DAMAGE. #include "libtorrent/aux_/escape_string.hpp" // for convert_from_native #include "libtorrent/aux_/max_path.hpp" // for TORRENT_MAX_PATH -#include -#include - namespace libtorrent { alert::alert() : m_timestamp(clock_type::now()) {} @@ -2096,4 +2090,3 @@ namespace libtorrent { #endif // TORRENT_DISABLE_LOGGING } // namespace libtorrent - diff --git a/src/http_seed_connection.cpp b/src/http_seed_connection.cpp index 56e49975d..c2456ceb3 100644 --- a/src/http_seed_connection.cpp +++ b/src/http_seed_connection.cpp @@ -30,23 +30,12 @@ POSSIBILITY OF SUCH DAMAGE. */ -#include "libtorrent/config.hpp" - -#include -#include // for snprintf #include // for PRId64 et.al. +#include "libtorrent/config.hpp" #include "libtorrent/http_seed_connection.hpp" -#include "libtorrent/session.hpp" -#include "libtorrent/identify_client.hpp" -#include "libtorrent/entry.hpp" -#include "libtorrent/bencode.hpp" -#include "libtorrent/alert_types.hpp" #include "libtorrent/invariant_check.hpp" -#include "libtorrent/io.hpp" -#include "libtorrent/version.hpp" #include "libtorrent/aux_/session_impl.hpp" -#include "libtorrent/parse_url.hpp" #include "libtorrent/peer_info.hpp" #include "libtorrent/hex.hpp" // for is_hex diff --git a/src/web_connection_base.cpp b/src/web_connection_base.cpp index ccc3ccb22..13673f123 100644 --- a/src/web_connection_base.cpp +++ b/src/web_connection_base.cpp @@ -32,24 +32,11 @@ POSSIBILITY OF SUCH DAMAGE. #include "libtorrent/config.hpp" -#include "libtorrent/aux_/disable_warnings_push.hpp" - -#include #include -#include #include -#include "libtorrent/aux_/disable_warnings_pop.hpp" - #include "libtorrent/web_connection_base.hpp" -#include "libtorrent/session.hpp" -#include "libtorrent/identify_client.hpp" -#include "libtorrent/entry.hpp" -#include "libtorrent/bencode.hpp" -#include "libtorrent/alert_types.hpp" #include "libtorrent/invariant_check.hpp" -#include "libtorrent/io.hpp" -#include "libtorrent/version.hpp" #include "libtorrent/parse_url.hpp" #include "libtorrent/peer_info.hpp" @@ -212,4 +199,3 @@ namespace libtorrent #endif } -