From 9e24cb344aab994bb62cf9cd6fe954eb81f0e068 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Dino=20Radakovi=C4=87?= <dinor@webrtc.org>
Date: Mon, 26 Feb 2018 13:22:48 +0100
Subject: [PATCH] Add move constructors and assignment operators to
 RtpPacketReceived and RtpPacketToSend. Since both are non-POD now, move would
 fall back to copy without these.
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

Bug: webrtc:8935
Change-Id: I270e7daf68aa00411ad5ae00da739292600043f2
Reviewed-on: https://webrtc-review.googlesource.com/57621
Reviewed-by: Danil Chapovalov <danilchap@webrtc.org>
Commit-Queue: Dino Radaković <dinor@webrtc.org>
Cr-Commit-Position: refs/heads/master@{#22186}
---
 modules/rtp_rtcp/source/rtp_packet_received.cc | 7 +++++++
 modules/rtp_rtcp/source/rtp_packet_received.h  | 5 +++++
 modules/rtp_rtcp/source/rtp_packet_to_send.cc  | 4 +++-
 modules/rtp_rtcp/source/rtp_packet_to_send.h   | 4 +++-
 4 files changed, 18 insertions(+), 2 deletions(-)

diff --git a/modules/rtp_rtcp/source/rtp_packet_received.cc b/modules/rtp_rtcp/source/rtp_packet_received.cc
index 1106e22a24..6acc9b55d4 100644
--- a/modules/rtp_rtcp/source/rtp_packet_received.cc
+++ b/modules/rtp_rtcp/source/rtp_packet_received.cc
@@ -20,6 +20,13 @@ namespace webrtc {
 RtpPacketReceived::RtpPacketReceived() = default;
 RtpPacketReceived::RtpPacketReceived(const ExtensionManager* extensions)
     : RtpPacket(extensions) {}
+RtpPacketReceived::RtpPacketReceived(const RtpPacketReceived& packet) = default;
+RtpPacketReceived::RtpPacketReceived(RtpPacketReceived&& packet) = default;
+
+RtpPacketReceived& RtpPacketReceived::operator=(
+    const RtpPacketReceived& packet) = default;
+RtpPacketReceived& RtpPacketReceived::operator=(RtpPacketReceived&& packet) =
+    default;
 
 RtpPacketReceived::~RtpPacketReceived() {}
 
diff --git a/modules/rtp_rtcp/source/rtp_packet_received.h b/modules/rtp_rtcp/source/rtp_packet_received.h
index 4cf6b23bd7..86900310e4 100644
--- a/modules/rtp_rtcp/source/rtp_packet_received.h
+++ b/modules/rtp_rtcp/source/rtp_packet_received.h
@@ -22,6 +22,11 @@ class RtpPacketReceived : public RtpPacket {
  public:
   RtpPacketReceived();
   explicit RtpPacketReceived(const ExtensionManager* extensions);
+  RtpPacketReceived(const RtpPacketReceived& packet);
+  RtpPacketReceived(RtpPacketReceived&& packet);
+
+  RtpPacketReceived& operator=(const RtpPacketReceived& packet);
+  RtpPacketReceived& operator=(RtpPacketReceived&& packet);
 
   ~RtpPacketReceived();
 
diff --git a/modules/rtp_rtcp/source/rtp_packet_to_send.cc b/modules/rtp_rtcp/source/rtp_packet_to_send.cc
index 9a9a57dc23..0153bbe73a 100644
--- a/modules/rtp_rtcp/source/rtp_packet_to_send.cc
+++ b/modules/rtp_rtcp/source/rtp_packet_to_send.cc
@@ -14,13 +14,15 @@ namespace webrtc {
 
 RtpPacketToSend::RtpPacketToSend(const ExtensionManager* extensions)
     : RtpPacket(extensions) {}
-RtpPacketToSend::RtpPacketToSend(const RtpPacketToSend& packet) = default;
 RtpPacketToSend::RtpPacketToSend(const ExtensionManager* extensions,
                                  size_t capacity)
     : RtpPacket(extensions, capacity) {}
+RtpPacketToSend::RtpPacketToSend(const RtpPacketToSend& packet) = default;
+RtpPacketToSend::RtpPacketToSend(RtpPacketToSend&& packet) = default;
 
 RtpPacketToSend& RtpPacketToSend::operator=(const RtpPacketToSend& packet) =
     default;
+RtpPacketToSend& RtpPacketToSend::operator=(RtpPacketToSend&& packet) = default;
 
 RtpPacketToSend::~RtpPacketToSend() = default;
 
diff --git a/modules/rtp_rtcp/source/rtp_packet_to_send.h b/modules/rtp_rtcp/source/rtp_packet_to_send.h
index 59992a1c58..1ed7dda478 100644
--- a/modules/rtp_rtcp/source/rtp_packet_to_send.h
+++ b/modules/rtp_rtcp/source/rtp_packet_to_send.h
@@ -21,10 +21,12 @@ namespace webrtc {
 class RtpPacketToSend : public RtpPacket {
  public:
   explicit RtpPacketToSend(const ExtensionManager* extensions);
-  RtpPacketToSend(const RtpPacketToSend& packet);
   RtpPacketToSend(const ExtensionManager* extensions, size_t capacity);
+  RtpPacketToSend(const RtpPacketToSend& packet);
+  RtpPacketToSend(RtpPacketToSend&& packet);
 
   RtpPacketToSend& operator=(const RtpPacketToSend& packet);
+  RtpPacketToSend& operator=(RtpPacketToSend&& packet);
 
   ~RtpPacketToSend();