diff --git a/modules/rtp_rtcp/source/rtcp_transceiver.h b/modules/rtp_rtcp/source/rtcp_transceiver.h index 9f823cccf3..fc9488c4ab 100644 --- a/modules/rtp_rtcp/source/rtcp_transceiver.h +++ b/modules/rtp_rtcp/source/rtcp_transceiver.h @@ -17,7 +17,6 @@ #include "modules/rtp_rtcp/source/rtcp_transceiver_config.h" #include "modules/rtp_rtcp/source/rtcp_transceiver_impl.h" -#include "rtc_base/constructormagic.h" #include "rtc_base/copyonwritebuffer.h" #include "rtc_base/task_queue.h" @@ -29,6 +28,8 @@ namespace webrtc { class RtcpTransceiver : public RtcpFeedbackSenderInterface { public: explicit RtcpTransceiver(const RtcpTransceiverConfig& config); + RtcpTransceiver(const RtcpTransceiver&) = delete; + RtcpTransceiver& operator=(const RtcpTransceiver&) = delete; // Note that interfaces provided in constructor still might be used after the // destructor. However they can only be used on the confic.task_queue. // Use Stop function to get notified when they are no longer used or @@ -91,8 +92,6 @@ class RtcpTransceiver : public RtcpFeedbackSenderInterface { private: rtc::TaskQueue* const task_queue_; std::unique_ptr rtcp_transceiver_; - - RTC_DISALLOW_IMPLICIT_CONSTRUCTORS(RtcpTransceiver); }; } // namespace webrtc diff --git a/modules/rtp_rtcp/source/rtcp_transceiver_impl.h b/modules/rtp_rtcp/source/rtcp_transceiver_impl.h index c97b2c5c11..eb9086f53e 100644 --- a/modules/rtp_rtcp/source/rtcp_transceiver_impl.h +++ b/modules/rtp_rtcp/source/rtcp_transceiver_impl.h @@ -25,7 +25,6 @@ #include "modules/rtp_rtcp/source/rtcp_packet/target_bitrate.h" #include "modules/rtp_rtcp/source/rtcp_transceiver_config.h" #include "rtc_base/cancelable_task_handle.h" -#include "rtc_base/constructormagic.h" #include "system_wrappers/include/ntp_time.h" namespace webrtc { @@ -36,6 +35,8 @@ namespace webrtc { class RtcpTransceiverImpl { public: explicit RtcpTransceiverImpl(const RtcpTransceiverConfig& config); + RtcpTransceiverImpl(const RtcpTransceiverImpl&) = delete; + RtcpTransceiverImpl& operator=(const RtcpTransceiverImpl&) = delete; ~RtcpTransceiverImpl(); void AddMediaReceiverRtcpObserver(uint32_t remote_ssrc, @@ -96,8 +97,6 @@ class RtcpTransceiverImpl { // needed. std::map remote_senders_; rtc::CancelableTaskHandle periodic_task_handle_; - - RTC_DISALLOW_IMPLICIT_CONSTRUCTORS(RtcpTransceiverImpl); }; } // namespace webrtc