fix build issue when asserts are disabled

This commit is contained in:
Arvid Norberg 2013-06-14 21:11:28 +00:00
parent 1888a8924d
commit 9803b6a15f
3 changed files with 3 additions and 3 deletions

View File

@ -540,7 +540,7 @@ namespace libtorrent
bencode(std::back_inserter(buf), ses_state); bencode(std::back_inserter(buf), ses_state);
lazy_entry e; lazy_entry e;
error_code ec; error_code ec;
#if defined TORRENT_DEBUG || TORRENT_RELEASE_ASSERTS #if defined TORRENT_DEBUG || TORRENT_RELEASE_ASSERTS || !defined BOOST_NO_EXCEPTIONS
int ret = int ret =
#endif #endif
lazy_bdecode(&buf[0], &buf[0] + buf.size(), e, ec); lazy_bdecode(&buf[0], &buf[0] + buf.size(), e, ec);

View File

@ -590,7 +590,7 @@ namespace libtorrent
error_code ec; error_code ec;
m_info_section.reset(new char[m_info_section_size]); m_info_section.reset(new char[m_info_section_size]);
memcpy(m_info_section.get(), t.m_info_section.get(), m_info_section_size); memcpy(m_info_section.get(), t.m_info_section.get(), m_info_section_size);
#if defined TORRENT_DEBUG || TORRENT_RELEASE_ASSERTS #if defined TORRENT_DEBUG || TORRENT_RELEASE_ASSERTS || !defined BOOST_NO_EXCEPTIONS
int ret = int ret =
#endif #endif
lazy_bdecode(m_info_section.get(), m_info_section.get() lazy_bdecode(m_info_section.get(), m_info_section.get()

View File

@ -47,7 +47,7 @@ void sig_handler(int sig)
{ {
char stack_text[10000]; char stack_text[10000];
#if defined TORRENT_DEBUG || TORRENT_RELEASE_ASSERTS #if (defined TORRENT_DEBUG && !TORRENT_NO_ASSERTS) || TORRENT_RELEASE_ASSERTS
print_backtrace(stack_text, sizeof(stack_text), 30); print_backtrace(stack_text, sizeof(stack_text), 30);
#elif defined __FUNCTION__ #elif defined __FUNCTION__
strcat(stack_text, __FUNCTION__); strcat(stack_text, __FUNCTION__);