diff options
author | Martin Braun <martin.braun@ettus.com> | 2021-01-08 12:26:09 +0100 |
---|---|---|
committer | Aaron Rossetto <aaron.rossetto@ni.com> | 2021-03-11 09:33:57 -0600 |
commit | 328572908b6ce8777a780e9fa8106954f749a3a5 (patch) | |
tree | bdf26f65aedbdd25c86d1bf6d3cfc65dfb5bea52 /host/lib | |
parent | 2000bbf17e166e89a32f819d0a31c940e1303d1f (diff) | |
download | uhd-328572908b6ce8777a780e9fa8106954f749a3a5.tar.gz uhd-328572908b6ce8777a780e9fa8106954f749a3a5.tar.bz2 uhd-328572908b6ce8777a780e9fa8106954f749a3a5.zip |
lib: Remove move-on-return for chdr_packet_writer
This is a pessimizing move, and clang warns about it.
Diffstat (limited to 'host/lib')
-rw-r--r-- | host/lib/include/uhdlib/rfnoc/chdr_packet_writer.hpp | 2 | ||||
-rw-r--r-- | host/lib/rfnoc/chdr_packet_writer.cpp | 2 | ||||
-rw-r--r-- | host/lib/rfnoc/graph_stream_manager.cpp | 4 | ||||
-rw-r--r-- | host/lib/rfnoc/mgmt_portal.cpp | 4 |
4 files changed, 6 insertions, 6 deletions
diff --git a/host/lib/include/uhdlib/rfnoc/chdr_packet_writer.hpp b/host/lib/include/uhdlib/rfnoc/chdr_packet_writer.hpp index b8d0c9ef4..bf4a88755 100644 --- a/host/lib/include/uhdlib/rfnoc/chdr_packet_writer.hpp +++ b/host/lib/include/uhdlib/rfnoc/chdr_packet_writer.hpp @@ -217,7 +217,7 @@ public: //! Returns a class that represents the contents of the CHDR header inline chdr_header get_chdr_header() const { - return std::move(_chdr_pkt->get_chdr_header()); + return _chdr_pkt->get_chdr_header(); } //! Returns a class that represents the contents of the CHDR payload 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<uint64_t> 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<std::recursive_mutex> lock(_mutex); _discover_topology(xport); |