From 328572908b6ce8777a780e9fa8106954f749a3a5 Mon Sep 17 00:00:00 2001 From: Martin Braun Date: Fri, 8 Jan 2021 12:26:09 +0100 Subject: lib: Remove move-on-return for chdr_packet_writer This is a pessimizing move, and clang warns about it. --- host/lib/rfnoc/chdr_packet_writer.cpp | 2 +- host/lib/rfnoc/graph_stream_manager.cpp | 4 ++-- host/lib/rfnoc/mgmt_portal.cpp | 4 ++-- 3 files changed, 5 insertions(+), 5 deletions(-) (limited to 'host/lib/rfnoc') diff --git a/host/lib/rfnoc/chdr_packet_writer.cpp b/host/lib/rfnoc/chdr_packet_writer.cpp index 95bf5c5d2..830b66a8d 100644 --- a/host/lib/rfnoc/chdr_packet_writer.cpp +++ b/host/lib/rfnoc/chdr_packet_writer.cpp @@ -66,7 +66,7 @@ public: chdr_header get_chdr_header() const override { assert(_pkt_buff); - return std::move(chdr_header(u64_to_host(_pkt_buff[0]))); + return chdr_header(u64_to_host(_pkt_buff[0])); } boost::optional get_timestamp() const override diff --git a/host/lib/rfnoc/graph_stream_manager.cpp b/host/lib/rfnoc/graph_stream_manager.cpp index de86d299b..fdf294006 100644 --- a/host/lib/rfnoc/graph_stream_manager.cpp +++ b/host/lib/rfnoc/graph_stream_manager.cpp @@ -31,8 +31,8 @@ public: for (const auto& lnk : links) { UHD_ASSERT_THROW(lnk.second); _link_mgrs.emplace(lnk.first, - std::move(link_stream_manager::make( - pkt_factory, *lnk.second, epid_alloc, lnk.first))); + link_stream_manager::make( + pkt_factory, *lnk.second, epid_alloc, lnk.first)); auto adapter = _link_mgrs.at(lnk.first)->get_adapter_id(); if (_alloc_map.count(adapter) == 0) { _alloc_map[adapter] = allocation_info{0, 0}; diff --git a/host/lib/rfnoc/mgmt_portal.cpp b/host/lib/rfnoc/mgmt_portal.cpp index 42b8039c0..0ebc9654d 100644 --- a/host/lib/rfnoc/mgmt_portal.cpp +++ b/host/lib/rfnoc/mgmt_portal.cpp @@ -185,8 +185,8 @@ public: , _endianness(pkt_factory.get_endianness()) , _my_node_id(my_sep_addr.first, NODE_TYPE_STRM_EP, xport.get_epid()) , _send_seqnum(0) - , _send_pkt(std::move(pkt_factory.make_mgmt())) - , _recv_pkt(std::move(pkt_factory.make_mgmt())) + , _send_pkt(pkt_factory.make_mgmt()) + , _recv_pkt(pkt_factory.make_mgmt()) { std::lock_guard lock(_mutex); _discover_topology(xport); -- cgit v1.2.3