merged build fix without exceptions from RC_0_16

This commit is contained in:
Arvid Norberg 2013-09-14 10:26:55 +00:00
parent 908e29957e
commit a386d8aca0
1 changed files with 10 additions and 3 deletions

View File

@ -1833,7 +1833,8 @@ namespace aux {
for (std::set<boost::shared_ptr<socket_type> >::iterator i = m_incoming_sockets.begin() for (std::set<boost::shared_ptr<socket_type> >::iterator i = m_incoming_sockets.begin()
, end(m_incoming_sockets.end()); i != end; ++i) , end(m_incoming_sockets.end()); i != end; ++i)
{ {
(*i)->close(); (*i)->close(ec);
TORRENT_ASSERT(!ec);
} }
m_incoming_sockets.clear(); m_incoming_sockets.clear();
@ -1846,12 +1847,18 @@ namespace aux {
} }
m_listen_sockets.clear(); m_listen_sockets.clear();
if (m_socks_listen_socket && m_socks_listen_socket->is_open()) if (m_socks_listen_socket && m_socks_listen_socket->is_open())
m_socks_listen_socket->close(); {
m_socks_listen_socket->close(ec);
TORRENT_ASSERT(!ec);
}
m_socks_listen_socket.reset(); m_socks_listen_socket.reset();
#if TORRENT_USE_I2P #if TORRENT_USE_I2P
if (m_i2p_listen_socket && m_i2p_listen_socket->is_open()) if (m_i2p_listen_socket && m_i2p_listen_socket->is_open())
m_i2p_listen_socket->close(); {
m_i2p_listen_socket->close(ec);
TORRENT_ASSERT(!ec);
}
m_i2p_listen_socket.reset(); m_i2p_listen_socket.reset();
#endif #endif