minor fixes

This commit is contained in:
Arvid Norberg 2011-08-29 00:59:42 +00:00
parent a286a6b4aa
commit 0a250c8f36
2 changed files with 2 additions and 2 deletions

View File

@ -85,7 +85,7 @@ POSSIBILITY OF SUCH DAMAGE.
#ifdef TORRENT_USE_OPENSSL
#include "libtorrent/ssl_stream.hpp"
#include <boost/asio/ssl/context.hpp>
#include <boost/asio/ssl/verify_context.hpp>
//#include <boost/asio/ssl/verify_context.hpp>
#endif
#if TORRENT_USE_IOSTREAM

View File

@ -1926,7 +1926,7 @@ bool utp_socket_impl::cancel_handlers(error_code const& ec, bool kill)
bool ret = m_read_handler || m_write_handler || m_connect_handler;
// calling the callbacks with m_userdata being 0 will just crash
TORRENT_ASSERT(ret == bool(m_userdata));
TORRENT_ASSERT((ret && bool(m_userdata)) || !ret);
if (m_read_handler) m_read_handler(m_userdata, 0, ec, kill);
m_read_handler = 0;