merged RC_1_1 into master

This commit is contained in:
Arvid Norberg 2018-07-18 10:48:36 +02:00
commit e88a9a4dda
3 changed files with 1 additions and 2 deletions

View File

@ -739,7 +739,6 @@ namespace {
ptr += 20;
std::memcpy(ptr, m_our_peer_id.data(), 20);
ptr += 20;
#ifndef TORRENT_DISABLE_LOGGING
if (should_log(peer_log_alert::outgoing))

View File

@ -153,6 +153,7 @@ namespace libtorrent {
UTF8 sequence[5];
UTF8* start = sequence;
res = ConvertUTF32toUTF8(const_cast<const UTF32**>(&cp), cp + 1, &start, start + 5, lenientConversion);
TORRENT_UNUSED(res);
TORRENT_ASSERT(res == conversionOK);
for (int i = 0; i < std::min(5, int(start - sequence)); ++i)

View File

@ -113,7 +113,6 @@ namespace libtorrent {
{
start += 3;
callback(xml_comment, {start, std::size_t(tag_name_end - start - 2)}, {});
tag_end = p - 2;
continue;
}
else