premiere
/
premiere-libtorrent
2
2
Fork 1
Code Issues Pull Requests Releases Wiki Activity

fixed release-asserts bulid

This commit is contained in:
Arvid Norberg 2011-07-05 04:05:12 +00:00
parent 220793c369
commit 8d86c3bacc
2 changed files with 4 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
include/libtorrent/torrent.hpp
View File

@ -1319,7 +1319,7 @@ namespace libtorrent
// data into this torrent instead of replacing them // data into this torrent instead of replacing them
bool m_merge_resume_trackers:1; bool m_merge_resume_trackers:1;
#ifdef TORRENT_DEBUG #if defined TORRENT_DEBUG || TORRENT_RELEASE_ASSERTS
public: public:
// set to false until we've loaded resume data // set to false until we've loaded resume data
bool m_resume_data_loaded; bool m_resume_data_loaded;

6
src/torrent.cpp
View File

@ -409,7 +409,7 @@ namespace libtorrent
, m_apply_ip_filter(p.apply_ip_filter) , m_apply_ip_filter(p.apply_ip_filter)
, m_merge_resume_trackers(p.merge_resume_trackers) , m_merge_resume_trackers(p.merge_resume_trackers)
{ {
#ifdef TORRENT_DEBUG #if defined TORRENT_DEBUG || TORRENT_RELEASE_ASSERTS
m_resume_data_loaded = false; m_resume_data_loaded = false;
#endif #endif
if (!m_apply_ip_filter) ++m_ses.m_non_filtered_torrents; if (!m_apply_ip_filter) ++m_ses.m_non_filtered_torrents;
@ -1315,7 +1315,7 @@ namespace libtorrent
m_ses.m_io_service.post(boost::bind(&torrent::files_checked, shared_from_this())); m_ses.m_io_service.post(boost::bind(&torrent::files_checked, shared_from_this()));
std::vector<char>().swap(m_resume_data); std::vector<char>().swap(m_resume_data);
lazy_entry().swap(m_resume_entry); lazy_entry().swap(m_resume_entry);
#ifdef TORRENT_DEBUG #if defined TORRENT_DEBUG || TORRENT_RELEASE_ASSERTS
m_resume_data_loaded = true; m_resume_data_loaded = true;
#endif #endif
return; return;
@ -1358,7 +1358,7 @@ namespace libtorrent
} }
} }
#ifdef TORRENT_DEBUG #if defined TORRENT_DEBUG || TORRENT_RELEASE_ASSERTS
m_resume_data_loaded = true; m_resume_data_loaded = true;
#endif #endif