From f9d31cf71baa91424af7096a42e81de52daa90ed Mon Sep 17 00:00:00 2001 From: arvidn Date: Sun, 2 Jun 2019 19:26:49 +0200 Subject: [PATCH] fix GCC-9 warnings --- include/libtorrent/aux_/disable_warnings_push.hpp | 3 +++ src/kademlia/find_data.cpp | 2 +- src/kademlia/get_item.cpp | 2 +- src/kademlia/get_peers.cpp | 6 +++--- src/kademlia/refresh.cpp | 2 +- src/kademlia/traversal_algorithm.cpp | 2 +- src/ut_pex.cpp | 2 +- 7 files changed, 11 insertions(+), 8 deletions(-) diff --git a/include/libtorrent/aux_/disable_warnings_push.hpp b/include/libtorrent/aux_/disable_warnings_push.hpp index eb66b2534..22bbe96f0 100644 --- a/include/libtorrent/aux_/disable_warnings_push.hpp +++ b/include/libtorrent/aux_/disable_warnings_push.hpp @@ -55,6 +55,9 @@ POSSIBILITY OF SUCH DAMAGE. #pragma GCC diagnostic ignored "-Wimplicit-fallthrough" #pragma GCC diagnostic ignored "-Wnoexcept-type" #endif +#if __GNUC__ >= 9 +#pragma GCC diagnostic ignored "-Wdeprecated-copy" +#endif #endif #ifdef __clang__ diff --git a/src/kademlia/find_data.cpp b/src/kademlia/find_data.cpp index 4285cb4ea..4c4b0fcc8 100644 --- a/src/kademlia/find_data.cpp +++ b/src/kademlia/find_data.cpp @@ -127,7 +127,7 @@ observer_ptr find_data::new_observer(udp::endpoint const& ep #if TORRENT_USE_ASSERTS if (o) o->m_in_constructor = false; #endif - return std::move(o); + return o; } char const* find_data::name() const { return "find_data"; } diff --git a/src/kademlia/get_item.cpp b/src/kademlia/get_item.cpp index 7c641f268..7a1154c0f 100644 --- a/src/kademlia/get_item.cpp +++ b/src/kademlia/get_item.cpp @@ -127,7 +127,7 @@ observer_ptr get_item::new_observer(udp::endpoint const& ep #if TORRENT_USE_ASSERTS if (o) o->m_in_constructor = false; #endif - return std::move(o); + return o; } bool get_item::invoke(observer_ptr o) diff --git a/src/kademlia/get_peers.cpp b/src/kademlia/get_peers.cpp index 24ed17a1a..93af53b84 100644 --- a/src/kademlia/get_peers.cpp +++ b/src/kademlia/get_peers.cpp @@ -157,7 +157,7 @@ observer_ptr get_peers::new_observer(udp::endpoint const& ep #if TORRENT_USE_ASSERTS if (o) o->m_in_constructor = false; #endif - return std::move(o); + return o; } obfuscated_get_peers::obfuscated_get_peers( @@ -184,7 +184,7 @@ observer_ptr obfuscated_get_peers::new_observer(udp::endpoint const& ep #if TORRENT_USE_ASSERTS if (o) o->m_in_constructor = false; #endif - return std::move(o); + return o; } else { @@ -193,7 +193,7 @@ observer_ptr obfuscated_get_peers::new_observer(udp::endpoint const& ep #if TORRENT_USE_ASSERTS if (o) o->m_in_constructor = false; #endif - return std::move(o); + return o; } } diff --git a/src/kademlia/refresh.cpp b/src/kademlia/refresh.cpp index 47f4f4cb3..efc225160 100644 --- a/src/kademlia/refresh.cpp +++ b/src/kademlia/refresh.cpp @@ -44,7 +44,7 @@ observer_ptr bootstrap::new_observer(udp::endpoint const& ep #if TORRENT_USE_ASSERTS if (o) o->m_in_constructor = false; #endif - return std::move(o); + return o; } bool bootstrap::invoke(observer_ptr o) diff --git a/src/kademlia/traversal_algorithm.cpp b/src/kademlia/traversal_algorithm.cpp index a528af35d..af36abce2 100644 --- a/src/kademlia/traversal_algorithm.cpp +++ b/src/kademlia/traversal_algorithm.cpp @@ -77,7 +77,7 @@ observer_ptr traversal_algorithm::new_observer(udp::endpoint const& ep #if TORRENT_USE_ASSERTS if (o) o->m_in_constructor = false; #endif - return std::move(o); + return o; } traversal_algorithm::traversal_algorithm(node& dht_node, node_id const& target) diff --git a/src/ut_pex.cpp b/src/ut_pex.cpp index 82fe17af6..d2c8d9491 100644 --- a/src/ut_pex.cpp +++ b/src/ut_pex.cpp @@ -628,7 +628,7 @@ namespace libtorrent { namespace { bt_peer_connection* c = static_cast(pc.native_handle().get()); auto p = std::make_shared(m_torrent, *c, *this); c->set_ut_pex(p); - return std::move(p); + return p; } } }