Skip to content

Commit b7e61f4

Browse files
authored
Qualify calls to std::move (clang 15) (#488)
Co-authored-by: Ed Catmur <[email protected]>
1 parent e2a14d8 commit b7e61f4

File tree

3 files changed

+6
-8
lines changed

3 files changed

+6
-8
lines changed

include/tins/rawpdu.h

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -115,7 +115,7 @@ class TINS_API RawPDU : public PDU {
115115
* \param data The payload to use.
116116
*/
117117
RawPDU(payload_type&& data)
118-
: payload_(move(data)) { }
118+
: payload_(std::move(data)) { }
119119
#endif // TINS_IS_CXX11
120120

121121
/**

src/tcp_ip/data_tracker.cpp

Lines changed: 4 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -33,8 +33,6 @@
3333

3434
#include <tins/detail/sequence_number_helpers.h>
3535

36-
using std::move;
37-
3836
using Tins::Internals::seq_compare;
3937

4038
namespace Tins {
@@ -67,7 +65,7 @@ bool DataTracker::process_payload(uint32_t seq, payload_type payload) {
6765
}
6866
bool added_some = false;
6967
// Store this payload
70-
store_payload(seq, move(payload));
68+
store_payload(seq, std::move(payload));
7169
// Keep looping while the fragments seq is lower or equal to our seq
7270
buffered_payload_type::iterator iter = buffered_payload_.find(seq_number_);
7371
while (iter != buffered_payload_.end() && seq_compare(iter->first, seq_number_) <= 0) {
@@ -85,7 +83,7 @@ bool DataTracker::process_payload(uint32_t seq, payload_type payload) {
8583
payload.begin(),
8684
payload.begin() + (seq_number_ - iter->first)
8785
);
88-
store_payload(seq_number_, move(iter->second));
86+
store_payload(seq_number_, std::move(iter->second));
8987
iter = erase_iterator(iter);
9088
}
9189
else {
@@ -158,14 +156,14 @@ void DataTracker::store_payload(uint32_t seq, payload_type payload) {
158156
// New segment, store it
159157
if (iter == buffered_payload_.end()) {
160158
total_buffered_bytes_ += payload.size();
161-
buffered_payload_.insert(make_pair(seq, move(payload)));
159+
buffered_payload_.insert(make_pair(seq, std::move(payload)));
162160
}
163161
else if (iter->second.size() < payload.size()) {
164162
// Increment by the diff between sizes
165163
total_buffered_bytes_ += (payload.size() - iter->second.size());
166164
// If we already have payload on this position but it's a shorter
167165
// chunk than the new one, replace it
168-
iter->second = move(payload);
166+
iter->second = std::move(payload);
169167
}
170168
}
171169

src/tcp_ip/flow.cpp

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -115,7 +115,7 @@ void Flow::process_packet(PDU& pdu) {
115115
}
116116

117117
// can process either way, since it will abort immediately if not needed
118-
if (data_tracker_.process_payload(tcp->seq(), move(raw->payload()))) {
118+
if (data_tracker_.process_payload(tcp->seq(), std::move(raw->payload()))) {
119119
if (on_data_callback_) {
120120
on_data_callback_(*this);
121121
}

0 commit comments

Comments
 (0)