From b7e61f4c76ac64053c9c4c9f8eadaabbe3a9381a Mon Sep 17 00:00:00 2001
From: Ed Catmur <ed@catmur.uk>
Date: Sun, 30 Apr 2023 12:13:56 -0500
Subject: [PATCH] Qualify calls to std::move (clang 15) (#488)

Co-authored-by: Ed Catmur <edward.catmur@mavensecurities.com>
---
 include/tins/rawpdu.h       |  2 +-
 src/tcp_ip/data_tracker.cpp | 10 ++++------
 src/tcp_ip/flow.cpp         |  2 +-
 3 files changed, 6 insertions(+), 8 deletions(-)

diff --git a/include/tins/rawpdu.h b/include/tins/rawpdu.h
index cd865ac8..3db88200 100644
--- a/include/tins/rawpdu.h
+++ b/include/tins/rawpdu.h
@@ -115,7 +115,7 @@ class TINS_API RawPDU : public PDU {
          * \param data The payload to use.
          */
         RawPDU(payload_type&& data)
-        : payload_(move(data)) { }
+        : payload_(std::move(data)) { }
     #endif // TINS_IS_CXX11
 
     /** 
diff --git a/src/tcp_ip/data_tracker.cpp b/src/tcp_ip/data_tracker.cpp
index ba03e018..3fcecc2f 100644
--- a/src/tcp_ip/data_tracker.cpp
+++ b/src/tcp_ip/data_tracker.cpp
@@ -33,8 +33,6 @@
 
 #include <tins/detail/sequence_number_helpers.h>
 
-using std::move;
-
 using Tins::Internals::seq_compare;
 
 namespace Tins {
@@ -67,7 +65,7 @@ bool DataTracker::process_payload(uint32_t seq, payload_type payload) {
     }
     bool added_some = false;
     // Store this payload
-    store_payload(seq, move(payload));
+    store_payload(seq, std::move(payload));
     // Keep looping while the fragments seq is lower or equal to our seq
     buffered_payload_type::iterator iter = buffered_payload_.find(seq_number_);
     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) {
                     payload.begin(),
                     payload.begin() + (seq_number_ - iter->first)
                 );
-                store_payload(seq_number_, move(iter->second));
+                store_payload(seq_number_, std::move(iter->second));
                 iter = erase_iterator(iter);
             }
             else {
@@ -158,14 +156,14 @@ void DataTracker::store_payload(uint32_t seq, payload_type payload) {
     // New segment, store it
     if (iter == buffered_payload_.end()) {
         total_buffered_bytes_ += payload.size();
-        buffered_payload_.insert(make_pair(seq, move(payload)));
+        buffered_payload_.insert(make_pair(seq, std::move(payload)));
     }
     else if (iter->second.size() < payload.size()) {
         // Increment by the diff between sizes
         total_buffered_bytes_ += (payload.size() - iter->second.size());
         // If we already have payload on this position but it's a shorter
         // chunk than the new one, replace it
-        iter->second = move(payload);
+        iter->second = std::move(payload);
     }
 }
 
diff --git a/src/tcp_ip/flow.cpp b/src/tcp_ip/flow.cpp
index 573474fa..5b97a40c 100644
--- a/src/tcp_ip/flow.cpp
+++ b/src/tcp_ip/flow.cpp
@@ -115,7 +115,7 @@ void Flow::process_packet(PDU& pdu) {
     }
 
     // can process either way, since it will abort immediately if not needed
-    if (data_tracker_.process_payload(tcp->seq(), move(raw->payload()))) {
+    if (data_tracker_.process_payload(tcp->seq(), std::move(raw->payload()))) {
         if (on_data_callback_) {
             on_data_callback_(*this);
         }