commit de95329daa7175fa28a508681ab262596111cc57
author Niels Möller <nisse@webrtc.org> Tue Sep 29 09:46:21 2020 +0200
committer Commit Bot <commit-bot@chromium.org> Tue Sep 29 10:19:20 2020 +0000
tree 9f35cfdfce150298401af727099eee1e1bb2fb93
parent 46be80d3498551c8497a4a0e127b395f4f18676f

Delete macros RTC_DISALLOW_ASSIGN and RTC_DISALLOW_IMPLICIT_CONSTRUCTORS

The former was unused, the latter is replaced with the explicit C++11
deletions. The related RTC_DISALLOW_COPY_AND_ASSIGN is left for now,
it is used in a lot more places.

Bug: None
Change-Id: I49503e7f2b9ff43c6285f8695833479bbc18c380
Reviewed-on: https://webrtc-review.googlesource.com/c/src/+/185500
Reviewed-by: Karl Wiberg <kwiberg@webrtc.org>
Commit-Queue: Niels Moller <nisse@webrtc.org>
Cr-Commit-Position: refs/heads/master@{#32224}

modules/video_coding/codecs/multiplex/multiplex_decoder_adapter.cc

diff --git a/modules/video_coding/codecs/multiplex/multiplex_decoder_adapter.cc b/modules/video_coding/codecs/multiplex/multiplex_decoder_adapter.cc
index cd39e72..39c14e4 100644
--- a/modules/video_coding/codecs/multiplex/multiplex_decoder_adapter.cc
+++ b/modules/video_coding/codecs/multiplex/multiplex_decoder_adapter.cc
@@ -76,23 +76,26 @@
         decoded_image_(decoded_image),
         decode_time_ms_(decode_time_ms),
         qp_(qp) {}
+
+  DecodedImageData() = delete;
+  DecodedImageData(const DecodedImageData&) = delete;
+  DecodedImageData& operator=(const DecodedImageData&) = delete;
+
   const AlphaCodecStream stream_idx_;
   VideoFrame decoded_image_;
   const absl::optional<int32_t> decode_time_ms_;
   const absl::optional<uint8_t> qp_;
-
- private:
-  RTC_DISALLOW_IMPLICIT_CONSTRUCTORS(DecodedImageData);
 };
 
 struct MultiplexDecoderAdapter::AugmentingData {
   AugmentingData(std::unique_ptr<uint8_t[]> augmenting_data, uint16_t data_size)
       : data_(std::move(augmenting_data)), size_(data_size) {}
+  AugmentingData() = delete;
+  AugmentingData(const AugmentingData&) = delete;
+  AugmentingData& operator=(const AugmentingData&) = delete;
+
   std::unique_ptr<uint8_t[]> data_;
   const uint16_t size_;
-
- private:
-  RTC_DISALLOW_IMPLICIT_CONSTRUCTORS(AugmentingData);
 };
 
 MultiplexDecoderAdapter::MultiplexDecoderAdapter(

modules/video_coding/frame_buffer2.h

diff --git a/modules/video_coding/frame_buffer2.h b/modules/video_coding/frame_buffer2.h
index c88ae89..746773d 100644
--- a/modules/video_coding/frame_buffer2.h
+++ b/modules/video_coding/frame_buffer2.h
@@ -23,7 +23,6 @@
 #include "modules/video_coding/inter_frame_delay.h"
 #include "modules/video_coding/jitter_estimator.h"
 #include "modules/video_coding/utility/decoded_frames_history.h"
-#include "rtc_base/constructor_magic.h"
 #include "rtc_base/event.h"
 #include "rtc_base/experiments/rtt_mult_experiment.h"
 #include "rtc_base/numerics/sequence_number_util.h"
@@ -50,6 +49,10 @@
               VCMTiming* timing,
               VCMReceiveStatisticsCallback* stats_callback);
 
+  FrameBuffer() = delete;
+  FrameBuffer(const FrameBuffer&) = delete;
+  FrameBuffer& operator=(const FrameBuffer&) = delete;
+
   virtual ~FrameBuffer();
 
   // Insert a frame into the frame buffer. Returns the picture id
@@ -188,8 +191,6 @@
 
   // rtt_mult experiment settings.
   const absl::optional<RttMultExperiment::Settings> rtt_mult_settings_;
-
-  RTC_DISALLOW_IMPLICIT_CONSTRUCTORS(FrameBuffer);
 };
 
 }  // namespace video_coding