Remove RTC_DISALLOW_COPY_AND_ASSIGN from modules/
Bug: webrtc:13555, webrtc:13082
Change-Id: I2c2cbcbd918f0cfa970c1a964893220ba11d4b41
Reviewed-on: https://webrtc-review.googlesource.com/c/src/+/247960
Reviewed-by: Artem Titov <titovartem@webrtc.org>
Reviewed-by: Harald Alvestrand <hta@webrtc.org>
Commit-Queue: (Daniel.L) Byoungchan Lee <daniel.l@hpcnt.com>
Cr-Commit-Position: refs/heads/main@{#35771}
diff --git a/modules/audio_coding/neteq/merge.h b/modules/audio_coding/neteq/merge.h
index 13aa31d..2f27106 100644
--- a/modules/audio_coding/neteq/merge.h
+++ b/modules/audio_coding/neteq/merge.h
@@ -12,7 +12,6 @@
#define MODULES_AUDIO_CODING_NETEQ_MERGE_H_
#include "modules/audio_coding/neteq/audio_multi_vector.h"
-#include "rtc_base/constructor_magic.h"
namespace webrtc {
@@ -36,6 +35,9 @@
SyncBuffer* sync_buffer);
virtual ~Merge();
+ Merge(const Merge&) = delete;
+ Merge& operator=(const Merge&) = delete;
+
// The main method to produce the audio data. The decoded data is supplied in
// `input`, having `input_length` samples in total for all channels
// (interleaved). The result is written to `output`. The number of channels
@@ -93,8 +95,6 @@
int16_t input_downsampled_[kInputDownsampLength];
AudioMultiVector expanded_;
std::vector<int16_t> temp_data_;
-
- RTC_DISALLOW_COPY_AND_ASSIGN(Merge);
};
} // namespace webrtc