Merge branch 'RC_1_1'

2016-02-10 18:28:54 -05:00 · 2016-02-10 18:28:54 -05:00 · 58f8fb164e
parent a27f35640d ee14337894
commit 58f8fb164e
2 changed files with 0 additions and 4 deletions
--- a/include/libtorrent/alert_types.hpp
+++ b/include/libtorrent/alert_types.hpp
@ -1292,9 +1292,6 @@ namespace libtorrent
 		// the specific low level operation that failed. See op_t.
 		int operation;

-		// the port attempted to be opened for listening
-		int port;
-
 		// the type of listen socket this alert refers to.
 		socket_type_t sock_type;

--- a/src/alert.cpp
+++ b/src/alert.cpp
@ -804,7 +804,6 @@ namespace libtorrent {
 		, socket_type_t t)
 		: error(ec)
 		, operation(op)
-		, port(prt)
 		, sock_type(t)
 		, endpoint(parse_interface(iface, prt))
 		, m_alloc(alloc)