diff --git a/webrtc/modules/rtp_rtcp/source/rtcp_packet/app.h b/webrtc/modules/rtp_rtcp/source/rtcp_packet/app.h index 0b233b3118..42a16c7a3a 100644 --- a/webrtc/modules/rtp_rtcp/source/rtcp_packet/app.h +++ b/webrtc/modules/rtp_rtcp/source/rtcp_packet/app.h @@ -12,7 +12,6 @@ #define WEBRTC_MODULES_RTP_RTCP_SOURCE_RTCP_PACKET_APP_H_ #include "webrtc/base/buffer.h" -#include "webrtc/base/constructormagic.h" #include "webrtc/modules/rtp_rtcp/source/rtcp_packet.h" namespace webrtc { @@ -56,8 +55,6 @@ class App : public RtcpPacket { uint32_t ssrc_; uint32_t name_; rtc::Buffer data_; - - RTC_DISALLOW_COPY_AND_ASSIGN(App); }; } // namespace rtcp diff --git a/webrtc/modules/rtp_rtcp/source/rtcp_packet/bye.h b/webrtc/modules/rtp_rtcp/source/rtcp_packet/bye.h index 744423ed70..c3f1cab491 100644 --- a/webrtc/modules/rtp_rtcp/source/rtcp_packet/bye.h +++ b/webrtc/modules/rtp_rtcp/source/rtcp_packet/bye.h @@ -15,7 +15,6 @@ #include #include -#include "webrtc/base/constructormagic.h" #include "webrtc/modules/rtp_rtcp/source/rtcp_packet.h" namespace webrtc { @@ -54,8 +53,6 @@ class Bye : public RtcpPacket { uint32_t sender_ssrc_; std::vector csrcs_; std::string reason_; - - RTC_DISALLOW_COPY_AND_ASSIGN(Bye); }; } // namespace rtcp diff --git a/webrtc/modules/rtp_rtcp/source/rtcp_packet/extended_jitter_report.h b/webrtc/modules/rtp_rtcp/source/rtcp_packet/extended_jitter_report.h index b26dc46b2c..2e56e33286 100644 --- a/webrtc/modules/rtp_rtcp/source/rtcp_packet/extended_jitter_report.h +++ b/webrtc/modules/rtp_rtcp/source/rtcp_packet/extended_jitter_report.h @@ -13,7 +13,6 @@ #include -#include "webrtc/base/constructormagic.h" #include "webrtc/modules/rtp_rtcp/source/rtcp_packet.h" namespace webrtc { @@ -51,8 +50,6 @@ class ExtendedJitterReport : public RtcpPacket { } std::vector inter_arrival_jitters_; - - RTC_DISALLOW_COPY_AND_ASSIGN(ExtendedJitterReport); }; } // namespace rtcp diff --git a/webrtc/modules/rtp_rtcp/source/rtcp_packet/extended_reports.h b/webrtc/modules/rtp_rtcp/source/rtcp_packet/extended_reports.h index 592ac3fe43..21fadd8338 100644 --- a/webrtc/modules/rtp_rtcp/source/rtcp_packet/extended_reports.h +++ b/webrtc/modules/rtp_rtcp/source/rtcp_packet/extended_reports.h @@ -13,7 +13,6 @@ #include -#include "webrtc/base/constructormagic.h" #include "webrtc/base/optional.h" #include "webrtc/modules/rtp_rtcp/source/rtcp_packet.h" #include "webrtc/modules/rtp_rtcp/source/rtcp_packet/dlrr.h" @@ -84,8 +83,6 @@ class ExtendedReports : public RtcpPacket { Dlrr dlrr_block_; // Dlrr without items treated same as no dlrr block. rtc::Optional voip_metric_block_; rtc::Optional target_bitrate_; - - RTC_DISALLOW_COPY_AND_ASSIGN(ExtendedReports); }; } // namespace rtcp } // namespace webrtc diff --git a/webrtc/modules/rtp_rtcp/source/rtcp_packet/nack.h b/webrtc/modules/rtp_rtcp/source/rtcp_packet/nack.h index e346200a8e..65a6593565 100644 --- a/webrtc/modules/rtp_rtcp/source/rtcp_packet/nack.h +++ b/webrtc/modules/rtp_rtcp/source/rtcp_packet/nack.h @@ -14,7 +14,6 @@ #include #include "webrtc/base/basictypes.h" -#include "webrtc/base/constructormagic.h" #include "webrtc/modules/rtp_rtcp/source/rtcp_packet/rtpfb.h" namespace webrtc { @@ -53,8 +52,6 @@ class Nack : public Rtpfb { std::vector packed_; std::vector packet_ids_; - - RTC_DISALLOW_COPY_AND_ASSIGN(Nack); }; } // namespace rtcp diff --git a/webrtc/modules/rtp_rtcp/source/rtcp_packet/pli.h b/webrtc/modules/rtp_rtcp/source/rtcp_packet/pli.h index 2ed6cd73b4..1cfde4f219 100644 --- a/webrtc/modules/rtp_rtcp/source/rtcp_packet/pli.h +++ b/webrtc/modules/rtp_rtcp/source/rtcp_packet/pli.h @@ -11,7 +11,6 @@ #define WEBRTC_MODULES_RTP_RTCP_SOURCE_RTCP_PACKET_PLI_H_ #include "webrtc/base/basictypes.h" -#include "webrtc/base/constructormagic.h" #include "webrtc/modules/rtp_rtcp/source/rtcp_packet/psfb.h" namespace webrtc { @@ -37,8 +36,6 @@ class Pli : public Psfb { size_t BlockLength() const override { return kHeaderLength + kCommonFeedbackLength; } - - RTC_DISALLOW_COPY_AND_ASSIGN(Pli); }; } // namespace rtcp diff --git a/webrtc/modules/rtp_rtcp/source/rtcp_packet/rapid_resync_request.h b/webrtc/modules/rtp_rtcp/source/rtcp_packet/rapid_resync_request.h index 7e2be322ba..eb45e14f79 100644 --- a/webrtc/modules/rtp_rtcp/source/rtcp_packet/rapid_resync_request.h +++ b/webrtc/modules/rtp_rtcp/source/rtcp_packet/rapid_resync_request.h @@ -12,7 +12,6 @@ #define WEBRTC_MODULES_RTP_RTCP_SOURCE_RTCP_PACKET_RAPID_RESYNC_REQUEST_H_ #include "webrtc/base/basictypes.h" -#include "webrtc/base/constructormagic.h" #include "webrtc/modules/rtp_rtcp/source/rtcp_packet/rtpfb.h" namespace webrtc { @@ -40,8 +39,6 @@ class RapidResyncRequest : public Rtpfb { size_t BlockLength() const override { return kHeaderLength + kCommonFeedbackLength; } - - RTC_DISALLOW_COPY_AND_ASSIGN(RapidResyncRequest); }; } // namespace rtcp } // namespace webrtc diff --git a/webrtc/modules/rtp_rtcp/source/rtcp_packet/receiver_report.h b/webrtc/modules/rtp_rtcp/source/rtcp_packet/receiver_report.h index c900d9c8c7..09aa0fef3b 100644 --- a/webrtc/modules/rtp_rtcp/source/rtcp_packet/receiver_report.h +++ b/webrtc/modules/rtp_rtcp/source/rtcp_packet/receiver_report.h @@ -14,7 +14,6 @@ #include #include "webrtc/base/basictypes.h" -#include "webrtc/base/constructormagic.h" #include "webrtc/modules/rtp_rtcp/source/rtcp_packet.h" #include "webrtc/modules/rtp_rtcp/source/rtcp_packet/report_block.h" @@ -56,8 +55,6 @@ class ReceiverReport : public RtcpPacket { uint32_t sender_ssrc_; std::vector report_blocks_; - - RTC_DISALLOW_COPY_AND_ASSIGN(ReceiverReport); }; } // namespace rtcp diff --git a/webrtc/modules/rtp_rtcp/source/rtcp_packet/remb.h b/webrtc/modules/rtp_rtcp/source/rtcp_packet/remb.h index 5cc00a2964..fdcce1082a 100644 --- a/webrtc/modules/rtp_rtcp/source/rtcp_packet/remb.h +++ b/webrtc/modules/rtp_rtcp/source/rtcp_packet/remb.h @@ -14,7 +14,6 @@ #include #include "webrtc/base/basictypes.h" -#include "webrtc/base/constructormagic.h" #include "webrtc/modules/rtp_rtcp/source/rtcp_packet/psfb.h" namespace webrtc { @@ -58,8 +57,6 @@ class Remb : public Psfb { uint64_t bitrate_bps_; std::vector ssrcs_; - - RTC_DISALLOW_COPY_AND_ASSIGN(Remb); }; } // namespace rtcp } // namespace webrtc diff --git a/webrtc/modules/rtp_rtcp/source/rtcp_packet/rpsi.h b/webrtc/modules/rtp_rtcp/source/rtcp_packet/rpsi.h index 79b6acec3e..d65023d8c3 100644 --- a/webrtc/modules/rtp_rtcp/source/rtcp_packet/rpsi.h +++ b/webrtc/modules/rtp_rtcp/source/rtcp_packet/rpsi.h @@ -12,7 +12,6 @@ #define WEBRTC_MODULES_RTP_RTCP_SOURCE_RTCP_PACKET_RPSI_H_ #include "webrtc/base/basictypes.h" -#include "webrtc/base/constructormagic.h" #include "webrtc/modules/rtp_rtcp/source/rtcp_packet/psfb.h" namespace webrtc { @@ -49,8 +48,6 @@ class Rpsi : public Psfb { uint8_t payload_type_; uint64_t picture_id_; size_t block_length_; - - RTC_DISALLOW_COPY_AND_ASSIGN(Rpsi); }; } // namespace rtcp } // namespace webrtc diff --git a/webrtc/modules/rtp_rtcp/source/rtcp_packet/sdes.h b/webrtc/modules/rtp_rtcp/source/rtcp_packet/sdes.h index 3e5abfea15..31366ad359 100644 --- a/webrtc/modules/rtp_rtcp/source/rtcp_packet/sdes.h +++ b/webrtc/modules/rtp_rtcp/source/rtcp_packet/sdes.h @@ -15,7 +15,6 @@ #include #include "webrtc/base/basictypes.h" -#include "webrtc/base/constructormagic.h" #include "webrtc/modules/rtp_rtcp/source/rtcp_packet.h" namespace webrtc { @@ -53,8 +52,6 @@ class Sdes : public RtcpPacket { std::vector chunks_; size_t block_length_; - - RTC_DISALLOW_COPY_AND_ASSIGN(Sdes); }; } // namespace rtcp } // namespace webrtc diff --git a/webrtc/modules/rtp_rtcp/source/rtcp_packet/sender_report.h b/webrtc/modules/rtp_rtcp/source/rtcp_packet/sender_report.h index 4064595df3..c62e505898 100644 --- a/webrtc/modules/rtp_rtcp/source/rtcp_packet/sender_report.h +++ b/webrtc/modules/rtp_rtcp/source/rtcp_packet/sender_report.h @@ -13,7 +13,6 @@ #include -#include "webrtc/base/constructormagic.h" #include "webrtc/modules/rtp_rtcp/source/rtcp_packet.h" #include "webrtc/modules/rtp_rtcp/source/rtcp_packet/report_block.h" #include "webrtc/system_wrappers/include/ntp_time.h" @@ -77,8 +76,6 @@ class SenderReport : public RtcpPacket { uint32_t sender_packet_count_; uint32_t sender_octet_count_; std::vector report_blocks_; - - RTC_DISALLOW_COPY_AND_ASSIGN(SenderReport); }; } // namespace rtcp diff --git a/webrtc/modules/rtp_rtcp/source/rtcp_packet/sli.h b/webrtc/modules/rtp_rtcp/source/rtcp_packet/sli.h index 3214b96dec..8d42baf0e1 100644 --- a/webrtc/modules/rtp_rtcp/source/rtcp_packet/sli.h +++ b/webrtc/modules/rtp_rtcp/source/rtcp_packet/sli.h @@ -14,7 +14,6 @@ #include #include "webrtc/base/basictypes.h" -#include "webrtc/base/constructormagic.h" #include "webrtc/modules/rtp_rtcp/source/rtcp_packet/psfb.h" namespace webrtc { @@ -73,8 +72,6 @@ class Sli : public Psfb { } std::vector items_; - - RTC_DISALLOW_COPY_AND_ASSIGN(Sli); }; } // namespace rtcp diff --git a/webrtc/modules/rtp_rtcp/source/rtcp_packet/tmmbn.h b/webrtc/modules/rtp_rtcp/source/rtcp_packet/tmmbn.h index 23db484edf..a02aad6422 100644 --- a/webrtc/modules/rtp_rtcp/source/rtcp_packet/tmmbn.h +++ b/webrtc/modules/rtp_rtcp/source/rtcp_packet/tmmbn.h @@ -14,7 +14,6 @@ #include #include "webrtc/base/basictypes.h" -#include "webrtc/base/constructormagic.h" #include "webrtc/modules/rtp_rtcp/source/rtcp_packet/rtpfb.h" #include "webrtc/modules/rtp_rtcp/source/rtcp_packet/tmmb_item.h" @@ -55,8 +54,6 @@ class Tmmbn : public Rtpfb { uint32_t media_ssrc() const; std::vector items_; - - RTC_DISALLOW_COPY_AND_ASSIGN(Tmmbn); }; } // namespace rtcp } // namespace webrtc diff --git a/webrtc/modules/rtp_rtcp/source/rtcp_packet/tmmbr.h b/webrtc/modules/rtp_rtcp/source/rtcp_packet/tmmbr.h index 1db99f46ea..2915c9d4bc 100644 --- a/webrtc/modules/rtp_rtcp/source/rtcp_packet/tmmbr.h +++ b/webrtc/modules/rtp_rtcp/source/rtcp_packet/tmmbr.h @@ -14,7 +14,6 @@ #include #include "webrtc/base/basictypes.h" -#include "webrtc/base/constructormagic.h" #include "webrtc/modules/rtp_rtcp/source/rtcp_packet/rtpfb.h" #include "webrtc/modules/rtp_rtcp/source/rtcp_packet/tmmb_item.h" @@ -54,8 +53,6 @@ class Tmmbr : public Rtpfb { void SetMediaSsrc(uint32_t ssrc); std::vector items_; - - RTC_DISALLOW_COPY_AND_ASSIGN(Tmmbr); }; } // namespace rtcp } // namespace webrtc diff --git a/webrtc/modules/rtp_rtcp/source/rtcp_packet/transport_feedback.h b/webrtc/modules/rtp_rtcp/source/rtcp_packet/transport_feedback.h index 9f2071174d..fa6ef04621 100644 --- a/webrtc/modules/rtp_rtcp/source/rtcp_packet/transport_feedback.h +++ b/webrtc/modules/rtp_rtcp/source/rtcp_packet/transport_feedback.h @@ -14,7 +14,6 @@ #include #include -#include "webrtc/base/constructormagic.h" #include "webrtc/modules/rtp_rtcp/source/rtcp_packet/rtpfb.h" namespace webrtc { @@ -109,8 +108,6 @@ class TransportFeedback : public Rtpfb { std::vector encoded_chunks_; const std::unique_ptr last_chunk_; size_t size_bytes_; - - RTC_DISALLOW_COPY_AND_ASSIGN(TransportFeedback); }; } // namespace rtcp