From a845afe6d9c1595977d467b86429ae3e2e139a0d Mon Sep 17 00:00:00 2001 From: arvidn Date: Tue, 9 Apr 2019 23:56:31 +0200 Subject: [PATCH] fix warnings --- include/libtorrent/aux_/alloca.hpp | 6 +++--- src/alert.cpp | 2 +- src/session_call.cpp | 2 +- src/settings_pack.cpp | 2 +- src/socket_type.cpp | 2 +- src/torrent.cpp | 4 ++-- src/torrent_handle.cpp | 2 +- src/torrent_peer.cpp | 4 ++-- test/test_bitfield.cpp | 3 ++- 9 files changed, 14 insertions(+), 13 deletions(-) diff --git a/include/libtorrent/aux_/alloca.hpp b/include/libtorrent/aux_/alloca.hpp index 05db406e5..6ec85afc5 100644 --- a/include/libtorrent/aux_/alloca.hpp +++ b/include/libtorrent/aux_/alloca.hpp @@ -83,7 +83,7 @@ struct alloca_destructor v = ::libtorrent::span(TORRENT_ALLOCA_tmp, TORRENT_ALLOCA_size); \ ::libtorrent::aux::uninitialized_default_construct(v.begin(), v.end()); \ } \ - ::libtorrent::aux::alloca_destructor v##_destructor{v}; + ::libtorrent::aux::alloca_destructor v##_destructor{v} #elif defined TORRENT_BSD @@ -94,7 +94,7 @@ struct alloca_destructor v = ::libtorrent::span(TORRENT_ALLOCA_tmp, TORRENT_ALLOCA_size); \ ::libtorrent::aux::uninitialized_default_construct(v.begin(), v.end()); \ } \ - ::libtorrent::aux::alloca_destructor v##_destructor{v}; + ::libtorrent::aux::alloca_destructor v##_destructor{v} #else @@ -105,7 +105,7 @@ struct alloca_destructor v = ::libtorrent::span(TORRENT_ALLOCA_tmp, TORRENT_ALLOCA_size); \ ::libtorrent::aux::uninitialized_default_construct(v.begin(), v.end()); \ } \ - ::libtorrent::aux::alloca_destructor v##_destructor{v}; + ::libtorrent::aux::alloca_destructor v##_destructor{v} #endif diff --git a/src/alert.cpp b/src/alert.cpp index cef0a290d..c044a12be 100644 --- a/src/alert.cpp +++ b/src/alert.cpp @@ -895,7 +895,7 @@ namespace { case o::partfile_write: return -1; case o::hostname_lookup: return -1; case o::symlink: return -1; - }; + } return -1; } #ifdef __GNUC__ diff --git a/src/session_call.cpp b/src/session_call.cpp index f0658afc5..bb9fad013 100644 --- a/src/session_call.cpp +++ b/src/session_call.cpp @@ -74,7 +74,7 @@ void torrent_wait(bool& done, aux::session_impl& ses) { blocking_call(); std::unique_lock l(ses.mut); - while (!done) { ses.cond.wait(l); }; + while (!done) { ses.cond.wait(l); } } } } // namespace aux namespace libtorrent diff --git a/src/settings_pack.cpp b/src/settings_pack.cpp index 57da4d509..4ab2321b5 100644 --- a/src/settings_pack.cpp +++ b/src/settings_pack.cpp @@ -381,7 +381,7 @@ constexpr int CLOSE_FILE_INTERVAL = 0; return int_settings[s - settings_pack::int_type_base].name; case settings_pack::bool_type_base: return bool_settings[s - settings_pack::bool_type_base].name; - }; + } return ""; } diff --git a/src/socket_type.cpp b/src/socket_type.cpp index 368821390..45e3146bf 100644 --- a/src/socket_type.cpp +++ b/src/socket_type.cpp @@ -57,7 +57,7 @@ namespace aux { CASE(utp_stream) return true; default: return false; - }; + } #undef CASE #else TORRENT_UNUSED(s); diff --git a/src/torrent.cpp b/src/torrent.cpp index ee9c6b18f..70e1ed21f 100644 --- a/src/torrent.cpp +++ b/src/torrent.cpp @@ -6569,7 +6569,7 @@ bool is_downloading_state(int const st) CASE(http_stream) CASE(utp_stream) default: break; - }; + } } #undef CASE #endif @@ -6752,7 +6752,7 @@ bool is_downloading_state(int const st) case SSL(socks5_stream) case SSL(http_stream) case SSL(utp_stream) - }; + } #undef SSL diff --git a/src/torrent_handle.cpp b/src/torrent_handle.cpp index d74f268a6..4f29e9bb6 100644 --- a/src/torrent_handle.cpp +++ b/src/torrent_handle.cpp @@ -698,7 +698,7 @@ namespace libtorrent { std::lock_guard l(holder_mutex); holder[cursor++] = r; - cursor = cursor % holder.end_index();; + cursor = cursor % holder.end_index(); return *r; } diff --git a/src/torrent_peer.cpp b/src/torrent_peer.cpp index 5d0cc12fd..b5e1749da 100644 --- a/src/torrent_peer.cpp +++ b/src/torrent_peer.cpp @@ -234,9 +234,9 @@ namespace libtorrent { ipv4_peer& ipv4_peer::operator=(ipv4_peer const& p) = default; #if TORRENT_USE_I2P - i2p_peer::i2p_peer(string_view dest, bool connectable + i2p_peer::i2p_peer(string_view dest, bool connectable_ , peer_source_flags_t const src) - : torrent_peer(0, connectable, src) + : torrent_peer(0, connectable_, src) , destination(dest) { is_v6_addr = false; diff --git a/test/test_bitfield.cpp b/test/test_bitfield.cpp index e52eda752..f40673d8d 100644 --- a/test/test_bitfield.cpp +++ b/test/test_bitfield.cpp @@ -390,7 +390,8 @@ TORRENT_TEST(not_initialized) TORRENT_TEST(self_assign) { bitfield test1(123, false); - test1 = test1; + bitfield* self_ptr = &test1; + test1 = *self_ptr; TEST_EQUAL(test1.size(), 123); TEST_EQUAL(test1.count(), 0); }