From f8a53d17ec49fd76152c87fd3891f886b9099d45 Mon Sep 17 00:00:00 2001 From: arvidn Date: Sun, 7 Feb 2016 02:12:58 -0500 Subject: [PATCH] un-deprecate the endpoint field in listen_failed_alert --- include/libtorrent/alert_types.hpp | 2 -- src/alert.cpp | 4 ---- 2 files changed, 6 deletions(-) diff --git a/include/libtorrent/alert_types.hpp b/include/libtorrent/alert_types.hpp index 291a4f421..9ced3fc7b 100644 --- a/include/libtorrent/alert_types.hpp +++ b/include/libtorrent/alert_types.hpp @@ -1298,10 +1298,8 @@ namespace libtorrent // the type of listen socket this alert refers to. socket_type_t sock_type; -#ifndef TORRENT_NO_DEPRECATE // the address and port libtorrent attempted to listen on tcp::endpoint endpoint; -#endif private: aux::stack_allocator const& m_alloc; diff --git a/src/alert.cpp b/src/alert.cpp index 310a9db07..5add43b12 100644 --- a/src/alert.cpp +++ b/src/alert.cpp @@ -787,14 +787,12 @@ namespace libtorrent { "SSL/uTP" }; -#ifndef TORRENT_NO_DEPRECATE tcp::endpoint parse_interface(std::string const& iface, int port) { // ignore errors error_code ec; return tcp::endpoint(address::from_string(iface, ec), port); } -#endif } listen_failed_alert::listen_failed_alert( @@ -808,9 +806,7 @@ namespace libtorrent { , operation(op) , port(prt) , sock_type(t) -#ifndef TORRENT_NO_DEPRECATE , endpoint(parse_interface(iface, prt)) -#endif , m_alloc(alloc) , m_interface_idx(alloc.copy_string(iface)) {}