From 846058a8d07dc3e2bbc0ec569e9d0972a73a6d9b Mon Sep 17 00:00:00 2001 From: Marcos Pinto Date: Wed, 20 Jun 2007 19:11:44 +0000 Subject: [PATCH] resync with lt trunk --- libtorrent/src/peer_connection.cpp | 3 +-- libtorrent/src/torrent.cpp | 3 ++- 2 files changed, 3 insertions(+), 3 deletions(-) diff --git a/libtorrent/src/peer_connection.cpp b/libtorrent/src/peer_connection.cpp index 08f448fce..a93072ea0 100755 --- a/libtorrent/src/peer_connection.cpp +++ b/libtorrent/src/peer_connection.cpp @@ -499,7 +499,7 @@ namespace libtorrent { // we couldn't find the torrent! #ifdef TORRENT_VERBOSE_LOGGING - (*m_logger) << " couldn't find a torrent with the given info_hash\n"; + (*m_logger) << " couldn't find a torrent with the given info_hash: " << ih << "\n"; #endif throw std::runtime_error("got info-hash that is not in our session"); } @@ -2254,7 +2254,6 @@ namespace libtorrent assert(m_reading); m_reading = false; - if (error) { #ifdef TORRENT_VERBOSE_LOGGING diff --git a/libtorrent/src/torrent.cpp b/libtorrent/src/torrent.cpp index 2ac6d1895..6c456fc6f 100755 --- a/libtorrent/src/torrent.cpp +++ b/libtorrent/src/torrent.cpp @@ -1779,7 +1779,7 @@ namespace libtorrent = instantiate_connection(m_ses.m_io_service, m_ses.peer_proxy()); boost::intrusive_ptr c(new bt_peer_connection( m_ses, shared_from_this(), s, a, peerinfo)); - + #ifndef NDEBUG c->m_in_constructor = false; #endif @@ -2855,3 +2855,4 @@ namespace libtorrent } +