codex-storage
/
deluge
mirror of https://github.com/codex-storage/deluge.git
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

resync with lt trunk

This commit is contained in:
Marcos Pinto 2007-06-20 19:11:44 +00:00
parent 620aab25f9
commit 846058a8d0
2 changed files with 3 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

3
libtorrent/src/peer_connection.cpp
View File

@ -499,7 +499,7 @@ namespace libtorrent
{ {
// we couldn't find the torrent! // we couldn't find the torrent!
#ifdef TORRENT_VERBOSE_LOGGING #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 #endif
throw std::runtime_error("got info-hash that is not in our session"); throw std::runtime_error("got info-hash that is not in our session");
} }
@ -2254,7 +2254,6 @@ namespace libtorrent
assert(m_reading); assert(m_reading);
m_reading = false; m_reading = false;
if (error) if (error)
{ {
#ifdef TORRENT_VERBOSE_LOGGING #ifdef TORRENT_VERBOSE_LOGGING

3
libtorrent/src/torrent.cpp
View File

@ -1779,7 +1779,7 @@ namespace libtorrent
= instantiate_connection(m_ses.m_io_service, m_ses.peer_proxy()); = instantiate_connection(m_ses.m_io_service, m_ses.peer_proxy());
boost::intrusive_ptr<peer_connection> c(new bt_peer_connection( boost::intrusive_ptr<peer_connection> c(new bt_peer_connection(
m_ses, shared_from_this(), s, a, peerinfo)); m_ses, shared_from_this(), s, a, peerinfo));
#ifndef NDEBUG #ifndef NDEBUG
c->m_in_constructor = false; c->m_in_constructor = false;
#endif #endif
@ -2855,3 +2855,4 @@ namespace libtorrent
} }