Add RTC_ prefix to contructormagic macros.
We must remove dependency on Chromium, i.e. we can't use Chromium's base/logging.h. That means we need to define these macros in WebRTC also when doing Chromium builds. And this causes redefinition.
* DISALLOW_ASSIGN -> RTC_DISALLOW_ASSIGN
* DISALLOW_COPY_AND_ASSIGN -> RTC_DISALLOW_COPY_AND_ASSIGN
* DISALLOW_IMPLICIT_CONSTRUCTORS -> RTC_DISALLOW_IMPLICIT_CONSTRUCTORS
Related CL: https://codereview.webrtc.org/1335923002/
BUG=chromium:468375
NOTRY=true
Review URL: https://codereview.webrtc.org/1345433002
Cr-Commit-Position: refs/heads/master@{#9953}
diff --git a/webrtc/modules/audio_coding/codecs/audio_decoder.h b/webrtc/modules/audio_coding/codecs/audio_decoder.h
index 5e9e33d..556268c 100644
--- a/webrtc/modules/audio_coding/codecs/audio_decoder.h
+++ b/webrtc/modules/audio_coding/codecs/audio_decoder.h
@@ -115,7 +115,7 @@
SpeechType* speech_type);
private:
- DISALLOW_COPY_AND_ASSIGN(AudioDecoder);
+ RTC_DISALLOW_COPY_AND_ASSIGN(AudioDecoder);
};
} // namespace webrtc
diff --git a/webrtc/modules/audio_coding/codecs/isac/audio_encoder_isac_t.h b/webrtc/modules/audio_coding/codecs/isac/audio_encoder_isac_t.h
index 686b45a..50d369b 100644
--- a/webrtc/modules/audio_coding/codecs/isac/audio_encoder_isac_t.h
+++ b/webrtc/modules/audio_coding/codecs/isac/audio_encoder_isac_t.h
@@ -91,7 +91,7 @@
// Timestamp of the previously encoded packet.
uint32_t last_encoded_timestamp_;
- DISALLOW_COPY_AND_ASSIGN(AudioEncoderIsacT);
+ RTC_DISALLOW_COPY_AND_ASSIGN(AudioEncoderIsacT);
};
template <typename T>
@@ -122,7 +122,7 @@
LockedIsacBandwidthInfo* bwinfo_;
int decoder_sample_rate_hz_;
- DISALLOW_COPY_AND_ASSIGN(AudioDecoderIsacT);
+ RTC_DISALLOW_COPY_AND_ASSIGN(AudioDecoderIsacT);
};
} // namespace webrtc
diff --git a/webrtc/modules/audio_coding/codecs/opus/interface/audio_decoder_opus.h b/webrtc/modules/audio_coding/codecs/opus/interface/audio_decoder_opus.h
index 9fa77b0..4dd5157 100644
--- a/webrtc/modules/audio_coding/codecs/opus/interface/audio_decoder_opus.h
+++ b/webrtc/modules/audio_coding/codecs/opus/interface/audio_decoder_opus.h
@@ -43,7 +43,7 @@
private:
OpusDecInst* dec_state_;
const size_t channels_;
- DISALLOW_COPY_AND_ASSIGN(AudioDecoderOpus);
+ RTC_DISALLOW_COPY_AND_ASSIGN(AudioDecoderOpus);
};
} // namespace webrtc
diff --git a/webrtc/modules/audio_coding/main/acm2/acm_receive_test.h b/webrtc/modules/audio_coding/main/acm2/acm_receive_test.h
index a1e0142..80e9fbe 100644
--- a/webrtc/modules/audio_coding/main/acm2/acm_receive_test.h
+++ b/webrtc/modules/audio_coding/main/acm2/acm_receive_test.h
@@ -56,7 +56,7 @@
const int output_freq_hz_;
NumOutputChannels expected_output_channels_;
- DISALLOW_COPY_AND_ASSIGN(AcmReceiveTest);
+ RTC_DISALLOW_COPY_AND_ASSIGN(AcmReceiveTest);
};
} // namespace test
diff --git a/webrtc/modules/audio_coding/main/acm2/acm_receive_test_oldapi.h b/webrtc/modules/audio_coding/main/acm2/acm_receive_test_oldapi.h
index 8e80ca7..6c12097 100644
--- a/webrtc/modules/audio_coding/main/acm2/acm_receive_test_oldapi.h
+++ b/webrtc/modules/audio_coding/main/acm2/acm_receive_test_oldapi.h
@@ -64,7 +64,7 @@
int output_freq_hz_;
NumOutputChannels exptected_output_channels_;
- DISALLOW_COPY_AND_ASSIGN(AcmReceiveTestOldApi);
+ RTC_DISALLOW_COPY_AND_ASSIGN(AcmReceiveTestOldApi);
};
// This test toggles the output frequency every |toggle_period_ms|. The test
diff --git a/webrtc/modules/audio_coding/main/acm2/acm_send_test.h b/webrtc/modules/audio_coding/main/acm2/acm_send_test.h
index 09fe9e6..b0d26ba 100644
--- a/webrtc/modules/audio_coding/main/acm2/acm_send_test.h
+++ b/webrtc/modules/audio_coding/main/acm2/acm_send_test.h
@@ -74,7 +74,7 @@
uint16_t sequence_number_;
std::vector<uint8_t> last_payload_vec_;
- DISALLOW_COPY_AND_ASSIGN(AcmSendTest);
+ RTC_DISALLOW_COPY_AND_ASSIGN(AcmSendTest);
};
} // namespace test
diff --git a/webrtc/modules/audio_coding/main/acm2/acm_send_test_oldapi.h b/webrtc/modules/audio_coding/main/acm2/acm_send_test_oldapi.h
index 523498b..7d17cb1 100644
--- a/webrtc/modules/audio_coding/main/acm2/acm_send_test_oldapi.h
+++ b/webrtc/modules/audio_coding/main/acm2/acm_send_test_oldapi.h
@@ -83,7 +83,7 @@
std::vector<uint8_t> last_payload_vec_;
bool data_to_send_;
- DISALLOW_COPY_AND_ASSIGN(AcmSendTestOldApi);
+ RTC_DISALLOW_COPY_AND_ASSIGN(AcmSendTestOldApi);
};
} // namespace test
diff --git a/webrtc/modules/audio_coding/main/acm2/codec_manager.h b/webrtc/modules/audio_coding/main/acm2/codec_manager.h
index 3372b7f..2337521 100644
--- a/webrtc/modules/audio_coding/main/acm2/codec_manager.h
+++ b/webrtc/modules/audio_coding/main/acm2/codec_manager.h
@@ -82,7 +82,7 @@
CodecOwner codec_owner_;
bool encoder_is_opus_;
- DISALLOW_COPY_AND_ASSIGN(CodecManager);
+ RTC_DISALLOW_COPY_AND_ASSIGN(CodecManager);
};
} // namespace acm2
diff --git a/webrtc/modules/audio_coding/main/acm2/codec_owner.h b/webrtc/modules/audio_coding/main/acm2/codec_owner.h
index cb533b6..ae7e452 100644
--- a/webrtc/modules/audio_coding/main/acm2/codec_owner.h
+++ b/webrtc/modules/audio_coding/main/acm2/codec_owner.h
@@ -70,7 +70,7 @@
rtc::scoped_ptr<AudioEncoder> cng_encoder_;
rtc::scoped_ptr<AudioEncoder> red_encoder_;
- DISALLOW_COPY_AND_ASSIGN(CodecOwner);
+ RTC_DISALLOW_COPY_AND_ASSIGN(CodecOwner);
};
} // namespace acm2
diff --git a/webrtc/modules/audio_coding/neteq/accelerate.h b/webrtc/modules/audio_coding/neteq/accelerate.h
index 1238b77..f66bc8e 100644
--- a/webrtc/modules/audio_coding/neteq/accelerate.h
+++ b/webrtc/modules/audio_coding/neteq/accelerate.h
@@ -65,7 +65,7 @@
AudioMultiVector* output) const override;
private:
- DISALLOW_COPY_AND_ASSIGN(Accelerate);
+ RTC_DISALLOW_COPY_AND_ASSIGN(Accelerate);
};
struct AccelerateFactory {
diff --git a/webrtc/modules/audio_coding/neteq/audio_decoder_impl.h b/webrtc/modules/audio_coding/neteq/audio_decoder_impl.h
index 6be344b..345f4d5 100644
--- a/webrtc/modules/audio_coding/neteq/audio_decoder_impl.h
+++ b/webrtc/modules/audio_coding/neteq/audio_decoder_impl.h
@@ -46,7 +46,7 @@
SpeechType* speech_type) override;
private:
- DISALLOW_COPY_AND_ASSIGN(AudioDecoderPcmU);
+ RTC_DISALLOW_COPY_AND_ASSIGN(AudioDecoderPcmU);
};
class AudioDecoderPcmA : public AudioDecoder {
@@ -64,7 +64,7 @@
SpeechType* speech_type) override;
private:
- DISALLOW_COPY_AND_ASSIGN(AudioDecoderPcmA);
+ RTC_DISALLOW_COPY_AND_ASSIGN(AudioDecoderPcmA);
};
class AudioDecoderPcmUMultiCh : public AudioDecoderPcmU {
@@ -77,7 +77,7 @@
private:
const size_t channels_;
- DISALLOW_COPY_AND_ASSIGN(AudioDecoderPcmUMultiCh);
+ RTC_DISALLOW_COPY_AND_ASSIGN(AudioDecoderPcmUMultiCh);
};
class AudioDecoderPcmAMultiCh : public AudioDecoderPcmA {
@@ -90,7 +90,7 @@
private:
const size_t channels_;
- DISALLOW_COPY_AND_ASSIGN(AudioDecoderPcmAMultiCh);
+ RTC_DISALLOW_COPY_AND_ASSIGN(AudioDecoderPcmAMultiCh);
};
#ifdef WEBRTC_CODEC_PCM16
@@ -111,7 +111,7 @@
SpeechType* speech_type) override;
private:
- DISALLOW_COPY_AND_ASSIGN(AudioDecoderPcm16B);
+ RTC_DISALLOW_COPY_AND_ASSIGN(AudioDecoderPcm16B);
};
// This class handles all four types (i.e., sample rates) of PCM16B codecs.
@@ -124,7 +124,7 @@
private:
const size_t channels_;
- DISALLOW_COPY_AND_ASSIGN(AudioDecoderPcm16BMultiCh);
+ RTC_DISALLOW_COPY_AND_ASSIGN(AudioDecoderPcm16BMultiCh);
};
#endif
@@ -147,7 +147,7 @@
private:
IlbcDecoderInstance* dec_state_;
- DISALLOW_COPY_AND_ASSIGN(AudioDecoderIlbc);
+ RTC_DISALLOW_COPY_AND_ASSIGN(AudioDecoderIlbc);
};
#endif
@@ -170,7 +170,7 @@
private:
G722DecInst* dec_state_;
- DISALLOW_COPY_AND_ASSIGN(AudioDecoderG722);
+ RTC_DISALLOW_COPY_AND_ASSIGN(AudioDecoderG722);
};
class AudioDecoderG722Stereo : public AudioDecoder {
@@ -199,7 +199,7 @@
G722DecInst* dec_state_left_;
G722DecInst* dec_state_right_;
- DISALLOW_COPY_AND_ASSIGN(AudioDecoderG722Stereo);
+ RTC_DISALLOW_COPY_AND_ASSIGN(AudioDecoderG722Stereo);
};
#endif
@@ -232,7 +232,7 @@
private:
CNG_dec_inst* dec_state_;
- DISALLOW_COPY_AND_ASSIGN(AudioDecoderCng);
+ RTC_DISALLOW_COPY_AND_ASSIGN(AudioDecoderCng);
};
enum NetEqDecoder {
diff --git a/webrtc/modules/audio_coding/neteq/audio_multi_vector.h b/webrtc/modules/audio_coding/neteq/audio_multi_vector.h
index 0aae9e3..1c28648 100644
--- a/webrtc/modules/audio_coding/neteq/audio_multi_vector.h
+++ b/webrtc/modules/audio_coding/neteq/audio_multi_vector.h
@@ -132,7 +132,7 @@
size_t num_channels_;
private:
- DISALLOW_COPY_AND_ASSIGN(AudioMultiVector);
+ RTC_DISALLOW_COPY_AND_ASSIGN(AudioMultiVector);
};
} // namespace webrtc
diff --git a/webrtc/modules/audio_coding/neteq/audio_vector.h b/webrtc/modules/audio_coding/neteq/audio_vector.h
index b44fbff..e046e38 100644
--- a/webrtc/modules/audio_coding/neteq/audio_vector.h
+++ b/webrtc/modules/audio_coding/neteq/audio_vector.h
@@ -105,7 +105,7 @@
// Note that this index may point outside of array_.
size_t capacity_; // Allocated number of samples in the array.
- DISALLOW_COPY_AND_ASSIGN(AudioVector);
+ RTC_DISALLOW_COPY_AND_ASSIGN(AudioVector);
};
} // namespace webrtc
diff --git a/webrtc/modules/audio_coding/neteq/background_noise.h b/webrtc/modules/audio_coding/neteq/background_noise.h
index 9ad12b7..2c67f21 100644
--- a/webrtc/modules/audio_coding/neteq/background_noise.h
+++ b/webrtc/modules/audio_coding/neteq/background_noise.h
@@ -130,7 +130,7 @@
bool initialized_;
NetEq::BackgroundNoiseMode mode_;
- DISALLOW_COPY_AND_ASSIGN(BackgroundNoise);
+ RTC_DISALLOW_COPY_AND_ASSIGN(BackgroundNoise);
};
} // namespace webrtc
diff --git a/webrtc/modules/audio_coding/neteq/buffer_level_filter.h b/webrtc/modules/audio_coding/neteq/buffer_level_filter.h
index add3cc4..0308706 100644
--- a/webrtc/modules/audio_coding/neteq/buffer_level_filter.h
+++ b/webrtc/modules/audio_coding/neteq/buffer_level_filter.h
@@ -42,7 +42,7 @@
int level_factor_; // Filter factor for the buffer level filter in Q8.
int filtered_current_level_; // Filtered current buffer level in Q8.
- DISALLOW_COPY_AND_ASSIGN(BufferLevelFilter);
+ RTC_DISALLOW_COPY_AND_ASSIGN(BufferLevelFilter);
};
} // namespace webrtc
diff --git a/webrtc/modules/audio_coding/neteq/comfort_noise.h b/webrtc/modules/audio_coding/neteq/comfort_noise.h
index d465596..1fc2258 100644
--- a/webrtc/modules/audio_coding/neteq/comfort_noise.h
+++ b/webrtc/modules/audio_coding/neteq/comfort_noise.h
@@ -66,7 +66,7 @@
DecoderDatabase* decoder_database_;
SyncBuffer* sync_buffer_;
int internal_error_code_;
- DISALLOW_COPY_AND_ASSIGN(ComfortNoise);
+ RTC_DISALLOW_COPY_AND_ASSIGN(ComfortNoise);
};
} // namespace webrtc
diff --git a/webrtc/modules/audio_coding/neteq/decision_logic.h b/webrtc/modules/audio_coding/neteq/decision_logic.h
index cb3dba0..30f7ddd 100644
--- a/webrtc/modules/audio_coding/neteq/decision_logic.h
+++ b/webrtc/modules/audio_coding/neteq/decision_logic.h
@@ -161,7 +161,7 @@
const NetEqPlayoutMode playout_mode_;
private:
- DISALLOW_COPY_AND_ASSIGN(DecisionLogic);
+ RTC_DISALLOW_COPY_AND_ASSIGN(DecisionLogic);
};
} // namespace webrtc
diff --git a/webrtc/modules/audio_coding/neteq/decision_logic_fax.h b/webrtc/modules/audio_coding/neteq/decision_logic_fax.h
index 861e2fa..204dcc1 100644
--- a/webrtc/modules/audio_coding/neteq/decision_logic_fax.h
+++ b/webrtc/modules/audio_coding/neteq/decision_logic_fax.h
@@ -53,7 +53,7 @@
bool* reset_decoder) override;
private:
- DISALLOW_COPY_AND_ASSIGN(DecisionLogicFax);
+ RTC_DISALLOW_COPY_AND_ASSIGN(DecisionLogicFax);
};
} // namespace webrtc
diff --git a/webrtc/modules/audio_coding/neteq/decision_logic_normal.h b/webrtc/modules/audio_coding/neteq/decision_logic_normal.h
index 7867407..7465906 100644
--- a/webrtc/modules/audio_coding/neteq/decision_logic_normal.h
+++ b/webrtc/modules/audio_coding/neteq/decision_logic_normal.h
@@ -99,7 +99,7 @@
// Checks if num_consecutive_expands_ >= kMaxWaitForPacket.
bool MaxWaitForPacket() const;
- DISALLOW_COPY_AND_ASSIGN(DecisionLogicNormal);
+ RTC_DISALLOW_COPY_AND_ASSIGN(DecisionLogicNormal);
};
} // namespace webrtc
diff --git a/webrtc/modules/audio_coding/neteq/decoder_database.h b/webrtc/modules/audio_coding/neteq/decoder_database.h
index 1dbc685..8ce0b69 100644
--- a/webrtc/modules/audio_coding/neteq/decoder_database.h
+++ b/webrtc/modules/audio_coding/neteq/decoder_database.h
@@ -147,7 +147,7 @@
int active_decoder_;
int active_cng_decoder_;
- DISALLOW_COPY_AND_ASSIGN(DecoderDatabase);
+ RTC_DISALLOW_COPY_AND_ASSIGN(DecoderDatabase);
};
} // namespace webrtc
diff --git a/webrtc/modules/audio_coding/neteq/delay_manager.h b/webrtc/modules/audio_coding/neteq/delay_manager.h
index b0d3f2e..785fced 100644
--- a/webrtc/modules/audio_coding/neteq/delay_manager.h
+++ b/webrtc/modules/audio_coding/neteq/delay_manager.h
@@ -157,7 +157,7 @@
DelayPeakDetector& peak_detector_;
int last_pack_cng_or_dtmf_;
- DISALLOW_COPY_AND_ASSIGN(DelayManager);
+ RTC_DISALLOW_COPY_AND_ASSIGN(DelayManager);
};
} // namespace webrtc
diff --git a/webrtc/modules/audio_coding/neteq/delay_peak_detector.h b/webrtc/modules/audio_coding/neteq/delay_peak_detector.h
index bf8ab74..69433b4 100644
--- a/webrtc/modules/audio_coding/neteq/delay_peak_detector.h
+++ b/webrtc/modules/audio_coding/neteq/delay_peak_detector.h
@@ -69,7 +69,7 @@
int peak_detection_threshold_;
int peak_period_counter_ms_;
- DISALLOW_COPY_AND_ASSIGN(DelayPeakDetector);
+ RTC_DISALLOW_COPY_AND_ASSIGN(DelayPeakDetector);
};
} // namespace webrtc
diff --git a/webrtc/modules/audio_coding/neteq/dsp_helper.h b/webrtc/modules/audio_coding/neteq/dsp_helper.h
index c40d10a..269c2eb 100644
--- a/webrtc/modules/audio_coding/neteq/dsp_helper.h
+++ b/webrtc/modules/audio_coding/neteq/dsp_helper.h
@@ -130,7 +130,7 @@
// Table of constants used in method DspHelper::ParabolicFit().
static const int16_t kParabolaCoefficients[17][3];
- DISALLOW_COPY_AND_ASSIGN(DspHelper);
+ RTC_DISALLOW_COPY_AND_ASSIGN(DspHelper);
};
} // namespace webrtc
diff --git a/webrtc/modules/audio_coding/neteq/dtmf_buffer.h b/webrtc/modules/audio_coding/neteq/dtmf_buffer.h
index 861a948..1f415ce 100644
--- a/webrtc/modules/audio_coding/neteq/dtmf_buffer.h
+++ b/webrtc/modules/audio_coding/neteq/dtmf_buffer.h
@@ -107,7 +107,7 @@
DtmfList buffer_;
- DISALLOW_COPY_AND_ASSIGN(DtmfBuffer);
+ RTC_DISALLOW_COPY_AND_ASSIGN(DtmfBuffer);
};
} // namespace webrtc
diff --git a/webrtc/modules/audio_coding/neteq/dtmf_tone_generator.h b/webrtc/modules/audio_coding/neteq/dtmf_tone_generator.h
index 767f66c..36d902a 100644
--- a/webrtc/modules/audio_coding/neteq/dtmf_tone_generator.h
+++ b/webrtc/modules/audio_coding/neteq/dtmf_tone_generator.h
@@ -48,7 +48,7 @@
int16_t sample_history1_[2]; // Last 2 samples for the 1st oscillator.
int16_t sample_history2_[2]; // Last 2 samples for the 2nd oscillator.
- DISALLOW_COPY_AND_ASSIGN(DtmfToneGenerator);
+ RTC_DISALLOW_COPY_AND_ASSIGN(DtmfToneGenerator);
};
} // namespace webrtc
diff --git a/webrtc/modules/audio_coding/neteq/expand.h b/webrtc/modules/audio_coding/neteq/expand.h
index 37e58d6..25c8c21 100644
--- a/webrtc/modules/audio_coding/neteq/expand.h
+++ b/webrtc/modules/audio_coding/neteq/expand.h
@@ -140,7 +140,7 @@
size_t expand_duration_samples_;
rtc::scoped_ptr<ChannelParameters[]> channel_parameters_;
- DISALLOW_COPY_AND_ASSIGN(Expand);
+ RTC_DISALLOW_COPY_AND_ASSIGN(Expand);
};
struct ExpandFactory {
diff --git a/webrtc/modules/audio_coding/neteq/interface/neteq.h b/webrtc/modules/audio_coding/neteq/interface/neteq.h
index 54458b9..48e8fd5 100644
--- a/webrtc/modules/audio_coding/neteq/interface/neteq.h
+++ b/webrtc/modules/audio_coding/neteq/interface/neteq.h
@@ -281,7 +281,7 @@
NetEq() {}
private:
- DISALLOW_COPY_AND_ASSIGN(NetEq);
+ RTC_DISALLOW_COPY_AND_ASSIGN(NetEq);
};
} // namespace webrtc
diff --git a/webrtc/modules/audio_coding/neteq/merge.h b/webrtc/modules/audio_coding/neteq/merge.h
index 727e9a6..a168502 100644
--- a/webrtc/modules/audio_coding/neteq/merge.h
+++ b/webrtc/modules/audio_coding/neteq/merge.h
@@ -96,7 +96,7 @@
int16_t input_downsampled_[kInputDownsampLength];
AudioMultiVector expanded_;
- DISALLOW_COPY_AND_ASSIGN(Merge);
+ RTC_DISALLOW_COPY_AND_ASSIGN(Merge);
};
} // namespace webrtc
diff --git a/webrtc/modules/audio_coding/neteq/mock/mock_external_decoder_pcm16b.h b/webrtc/modules/audio_coding/neteq/mock/mock_external_decoder_pcm16b.h
index fca1c2d..8cf89c0 100644
--- a/webrtc/modules/audio_coding/neteq/mock/mock_external_decoder_pcm16b.h
+++ b/webrtc/modules/audio_coding/neteq/mock/mock_external_decoder_pcm16b.h
@@ -43,7 +43,7 @@
size_t Channels() const override { return 1; }
private:
- DISALLOW_COPY_AND_ASSIGN(ExternalPcm16B);
+ RTC_DISALLOW_COPY_AND_ASSIGN(ExternalPcm16B);
};
// Create a mock of ExternalPcm16B which delegates all calls to the real object.
diff --git a/webrtc/modules/audio_coding/neteq/neteq_impl.h b/webrtc/modules/audio_coding/neteq/neteq_impl.h
index 6a45db6..effecba 100644
--- a/webrtc/modules/audio_coding/neteq/neteq_impl.h
+++ b/webrtc/modules/audio_coding/neteq/neteq_impl.h
@@ -399,7 +399,7 @@
uint32_t decoded_packet_timestamp_ GUARDED_BY(crit_sect_);
private:
- DISALLOW_COPY_AND_ASSIGN(NetEqImpl);
+ RTC_DISALLOW_COPY_AND_ASSIGN(NetEqImpl);
};
} // namespace webrtc
diff --git a/webrtc/modules/audio_coding/neteq/normal.h b/webrtc/modules/audio_coding/neteq/normal.h
index aa24b52..23887f5 100644
--- a/webrtc/modules/audio_coding/neteq/normal.h
+++ b/webrtc/modules/audio_coding/neteq/normal.h
@@ -61,7 +61,7 @@
const BackgroundNoise& background_noise_;
Expand* expand_;
- DISALLOW_COPY_AND_ASSIGN(Normal);
+ RTC_DISALLOW_COPY_AND_ASSIGN(Normal);
};
} // namespace webrtc
diff --git a/webrtc/modules/audio_coding/neteq/packet_buffer.h b/webrtc/modules/audio_coding/neteq/packet_buffer.h
index 737845e..03c11e6 100644
--- a/webrtc/modules/audio_coding/neteq/packet_buffer.h
+++ b/webrtc/modules/audio_coding/neteq/packet_buffer.h
@@ -148,7 +148,7 @@
private:
size_t max_number_of_packets_;
PacketList buffer_;
- DISALLOW_COPY_AND_ASSIGN(PacketBuffer);
+ RTC_DISALLOW_COPY_AND_ASSIGN(PacketBuffer);
};
} // namespace webrtc
diff --git a/webrtc/modules/audio_coding/neteq/payload_splitter.h b/webrtc/modules/audio_coding/neteq/payload_splitter.h
index 6023d4e..b0c4b5f 100644
--- a/webrtc/modules/audio_coding/neteq/payload_splitter.h
+++ b/webrtc/modules/audio_coding/neteq/payload_splitter.h
@@ -83,7 +83,7 @@
uint32_t timestamps_per_frame,
PacketList* new_packets);
- DISALLOW_COPY_AND_ASSIGN(PayloadSplitter);
+ RTC_DISALLOW_COPY_AND_ASSIGN(PayloadSplitter);
};
} // namespace webrtc
diff --git a/webrtc/modules/audio_coding/neteq/post_decode_vad.h b/webrtc/modules/audio_coding/neteq/post_decode_vad.h
index 2886cf9..7bf5ad1 100644
--- a/webrtc/modules/audio_coding/neteq/post_decode_vad.h
+++ b/webrtc/modules/audio_coding/neteq/post_decode_vad.h
@@ -65,7 +65,7 @@
int sid_interval_counter_;
::VadInst* vad_instance_;
- DISALLOW_COPY_AND_ASSIGN(PostDecodeVad);
+ RTC_DISALLOW_COPY_AND_ASSIGN(PostDecodeVad);
};
} // namespace webrtc
diff --git a/webrtc/modules/audio_coding/neteq/preemptive_expand.h b/webrtc/modules/audio_coding/neteq/preemptive_expand.h
index ca48e19..c4c2360 100644
--- a/webrtc/modules/audio_coding/neteq/preemptive_expand.h
+++ b/webrtc/modules/audio_coding/neteq/preemptive_expand.h
@@ -70,7 +70,7 @@
size_t old_data_length_per_channel_;
size_t overlap_samples_;
- DISALLOW_COPY_AND_ASSIGN(PreemptiveExpand);
+ RTC_DISALLOW_COPY_AND_ASSIGN(PreemptiveExpand);
};
struct PreemptiveExpandFactory {
diff --git a/webrtc/modules/audio_coding/neteq/random_vector.h b/webrtc/modules/audio_coding/neteq/random_vector.h
index 8c75eae..61651e5 100644
--- a/webrtc/modules/audio_coding/neteq/random_vector.h
+++ b/webrtc/modules/audio_coding/neteq/random_vector.h
@@ -43,7 +43,7 @@
uint32_t seed_;
int16_t seed_increment_;
- DISALLOW_COPY_AND_ASSIGN(RandomVector);
+ RTC_DISALLOW_COPY_AND_ASSIGN(RandomVector);
};
} // namespace webrtc
diff --git a/webrtc/modules/audio_coding/neteq/rtcp.h b/webrtc/modules/audio_coding/neteq/rtcp.h
index 2a765ef..5235397 100644
--- a/webrtc/modules/audio_coding/neteq/rtcp.h
+++ b/webrtc/modules/audio_coding/neteq/rtcp.h
@@ -51,7 +51,7 @@
uint32_t jitter_; // Current jitter value.
int32_t transit_; // Clock difference for previous packet.
- DISALLOW_COPY_AND_ASSIGN(Rtcp);
+ RTC_DISALLOW_COPY_AND_ASSIGN(Rtcp);
};
} // namespace webrtc
diff --git a/webrtc/modules/audio_coding/neteq/statistics_calculator.h b/webrtc/modules/audio_coding/neteq/statistics_calculator.h
index 5bb66b66..08235df 100644
--- a/webrtc/modules/audio_coding/neteq/statistics_calculator.h
+++ b/webrtc/modules/audio_coding/neteq/statistics_calculator.h
@@ -160,7 +160,7 @@
PeriodicUmaCount delayed_packet_outage_counter_;
PeriodicUmaAverage excess_buffer_delay_;
- DISALLOW_COPY_AND_ASSIGN(StatisticsCalculator);
+ RTC_DISALLOW_COPY_AND_ASSIGN(StatisticsCalculator);
};
} // namespace webrtc
diff --git a/webrtc/modules/audio_coding/neteq/sync_buffer.h b/webrtc/modules/audio_coding/neteq/sync_buffer.h
index bbb494e..38e7887 100644
--- a/webrtc/modules/audio_coding/neteq/sync_buffer.h
+++ b/webrtc/modules/audio_coding/neteq/sync_buffer.h
@@ -92,7 +92,7 @@
uint32_t end_timestamp_; // The timestamp of the last sample in the buffer.
size_t dtmf_index_; // Index to the first non-DTMF sample in the buffer.
- DISALLOW_COPY_AND_ASSIGN(SyncBuffer);
+ RTC_DISALLOW_COPY_AND_ASSIGN(SyncBuffer);
};
} // namespace webrtc
diff --git a/webrtc/modules/audio_coding/neteq/time_stretch.h b/webrtc/modules/audio_coding/neteq/time_stretch.h
index 14383d8..00a1415 100644
--- a/webrtc/modules/audio_coding/neteq/time_stretch.h
+++ b/webrtc/modules/audio_coding/neteq/time_stretch.h
@@ -109,7 +109,7 @@
bool SpeechDetection(int32_t vec1_energy, int32_t vec2_energy,
size_t peak_index, int scaling) const;
- DISALLOW_COPY_AND_ASSIGN(TimeStretch);
+ RTC_DISALLOW_COPY_AND_ASSIGN(TimeStretch);
};
} // namespace webrtc
diff --git a/webrtc/modules/audio_coding/neteq/timestamp_scaler.h b/webrtc/modules/audio_coding/neteq/timestamp_scaler.h
index fcbb773..9129d84 100644
--- a/webrtc/modules/audio_coding/neteq/timestamp_scaler.h
+++ b/webrtc/modules/audio_coding/neteq/timestamp_scaler.h
@@ -61,7 +61,7 @@
uint32_t internal_ref_;
const DecoderDatabase& decoder_database_;
- DISALLOW_COPY_AND_ASSIGN(TimestampScaler);
+ RTC_DISALLOW_COPY_AND_ASSIGN(TimestampScaler);
};
} // namespace webrtc
diff --git a/webrtc/modules/audio_coding/neteq/tools/audio_checksum.h b/webrtc/modules/audio_coding/neteq/tools/audio_checksum.h
index b4a6a81..a302cff 100644
--- a/webrtc/modules/audio_coding/neteq/tools/audio_checksum.h
+++ b/webrtc/modules/audio_coding/neteq/tools/audio_checksum.h
@@ -51,7 +51,7 @@
char checksum_result_[rtc::Md5Digest::kSize];
bool finished_;
- DISALLOW_COPY_AND_ASSIGN(AudioChecksum);
+ RTC_DISALLOW_COPY_AND_ASSIGN(AudioChecksum);
};
} // namespace test
diff --git a/webrtc/modules/audio_coding/neteq/tools/audio_loop.h b/webrtc/modules/audio_coding/neteq/tools/audio_loop.h
index 87ff688..a897ee5 100644
--- a/webrtc/modules/audio_coding/neteq/tools/audio_loop.h
+++ b/webrtc/modules/audio_coding/neteq/tools/audio_loop.h
@@ -51,7 +51,7 @@
size_t block_length_samples_;
rtc::scoped_ptr<int16_t[]> audio_array_;
- DISALLOW_COPY_AND_ASSIGN(AudioLoop);
+ RTC_DISALLOW_COPY_AND_ASSIGN(AudioLoop);
};
} // namespace test
diff --git a/webrtc/modules/audio_coding/neteq/tools/audio_sink.h b/webrtc/modules/audio_coding/neteq/tools/audio_sink.h
index b7b3ed1..3bd2df5 100644
--- a/webrtc/modules/audio_coding/neteq/tools/audio_sink.h
+++ b/webrtc/modules/audio_coding/neteq/tools/audio_sink.h
@@ -38,7 +38,7 @@
}
private:
- DISALLOW_COPY_AND_ASSIGN(AudioSink);
+ RTC_DISALLOW_COPY_AND_ASSIGN(AudioSink);
};
// Forks the output audio to two AudioSink objects.
@@ -56,7 +56,7 @@
AudioSink* left_sink_;
AudioSink* right_sink_;
- DISALLOW_COPY_AND_ASSIGN(AudioSinkFork);
+ RTC_DISALLOW_COPY_AND_ASSIGN(AudioSinkFork);
};
} // namespace test
} // namespace webrtc
diff --git a/webrtc/modules/audio_coding/neteq/tools/constant_pcm_packet_source.h b/webrtc/modules/audio_coding/neteq/tools/constant_pcm_packet_source.h
index b780fbf..6972303 100644
--- a/webrtc/modules/audio_coding/neteq/tools/constant_pcm_packet_source.h
+++ b/webrtc/modules/audio_coding/neteq/tools/constant_pcm_packet_source.h
@@ -49,7 +49,7 @@
uint32_t timestamp_;
const uint32_t payload_ssrc_;
- DISALLOW_COPY_AND_ASSIGN(ConstantPcmPacketSource);
+ RTC_DISALLOW_COPY_AND_ASSIGN(ConstantPcmPacketSource);
};
} // namespace test
diff --git a/webrtc/modules/audio_coding/neteq/tools/input_audio_file.h b/webrtc/modules/audio_coding/neteq/tools/input_audio_file.h
index fae5573..a6e12db 100644
--- a/webrtc/modules/audio_coding/neteq/tools/input_audio_file.h
+++ b/webrtc/modules/audio_coding/neteq/tools/input_audio_file.h
@@ -50,7 +50,7 @@
private:
FILE* fp_;
- DISALLOW_COPY_AND_ASSIGN(InputAudioFile);
+ RTC_DISALLOW_COPY_AND_ASSIGN(InputAudioFile);
};
} // namespace test
diff --git a/webrtc/modules/audio_coding/neteq/tools/output_audio_file.h b/webrtc/modules/audio_coding/neteq/tools/output_audio_file.h
index ff30f67..a9142a6 100644
--- a/webrtc/modules/audio_coding/neteq/tools/output_audio_file.h
+++ b/webrtc/modules/audio_coding/neteq/tools/output_audio_file.h
@@ -42,7 +42,7 @@
private:
FILE* out_file_;
- DISALLOW_COPY_AND_ASSIGN(OutputAudioFile);
+ RTC_DISALLOW_COPY_AND_ASSIGN(OutputAudioFile);
};
} // namespace test
diff --git a/webrtc/modules/audio_coding/neteq/tools/output_wav_file.h b/webrtc/modules/audio_coding/neteq/tools/output_wav_file.h
index 1b1ed42..c36c7da 100644
--- a/webrtc/modules/audio_coding/neteq/tools/output_wav_file.h
+++ b/webrtc/modules/audio_coding/neteq/tools/output_wav_file.h
@@ -35,7 +35,7 @@
private:
WavWriter wav_writer_;
- DISALLOW_COPY_AND_ASSIGN(OutputWavFile);
+ RTC_DISALLOW_COPY_AND_ASSIGN(OutputWavFile);
};
} // namespace test
diff --git a/webrtc/modules/audio_coding/neteq/tools/packet.h b/webrtc/modules/audio_coding/neteq/tools/packet.h
index a4e48d8..8e43633 100644
--- a/webrtc/modules/audio_coding/neteq/tools/packet.h
+++ b/webrtc/modules/audio_coding/neteq/tools/packet.h
@@ -114,7 +114,7 @@
double time_ms_; // Used to denote a packet's arrival time.
bool valid_header_; // Set by the RtpHeaderParser.
- DISALLOW_COPY_AND_ASSIGN(Packet);
+ RTC_DISALLOW_COPY_AND_ASSIGN(Packet);
};
} // namespace test
diff --git a/webrtc/modules/audio_coding/neteq/tools/packet_source.h b/webrtc/modules/audio_coding/neteq/tools/packet_source.h
index 968400c..804a94d 100644
--- a/webrtc/modules/audio_coding/neteq/tools/packet_source.h
+++ b/webrtc/modules/audio_coding/neteq/tools/packet_source.h
@@ -46,7 +46,7 @@
uint32_t ssrc_; // The selected SSRC. All other SSRCs will be discarded.
private:
- DISALLOW_COPY_AND_ASSIGN(PacketSource);
+ RTC_DISALLOW_COPY_AND_ASSIGN(PacketSource);
};
} // namespace test
diff --git a/webrtc/modules/audio_coding/neteq/tools/resample_input_audio_file.h b/webrtc/modules/audio_coding/neteq/tools/resample_input_audio_file.h
index b15d46f..c0af354 100644
--- a/webrtc/modules/audio_coding/neteq/tools/resample_input_audio_file.h
+++ b/webrtc/modules/audio_coding/neteq/tools/resample_input_audio_file.h
@@ -43,7 +43,7 @@
const int file_rate_hz_;
int output_rate_hz_;
Resampler resampler_;
- DISALLOW_COPY_AND_ASSIGN(ResampleInputAudioFile);
+ RTC_DISALLOW_COPY_AND_ASSIGN(ResampleInputAudioFile);
};
} // namespace test
diff --git a/webrtc/modules/audio_coding/neteq/tools/rtc_event_log_source.h b/webrtc/modules/audio_coding/neteq/tools/rtc_event_log_source.h
index d144b51..7150bcf 100644
--- a/webrtc/modules/audio_coding/neteq/tools/rtc_event_log_source.h
+++ b/webrtc/modules/audio_coding/neteq/tools/rtc_event_log_source.h
@@ -61,7 +61,7 @@
rtc::scoped_ptr<rtclog::EventStream> event_log_;
rtc::scoped_ptr<RtpHeaderParser> parser_;
- DISALLOW_COPY_AND_ASSIGN(RtcEventLogSource);
+ RTC_DISALLOW_COPY_AND_ASSIGN(RtcEventLogSource);
};
} // namespace test
diff --git a/webrtc/modules/audio_coding/neteq/tools/rtp_file_source.h b/webrtc/modules/audio_coding/neteq/tools/rtp_file_source.h
index d711685..d0856a8 100644
--- a/webrtc/modules/audio_coding/neteq/tools/rtp_file_source.h
+++ b/webrtc/modules/audio_coding/neteq/tools/rtp_file_source.h
@@ -55,7 +55,7 @@
rtc::scoped_ptr<RtpFileReader> rtp_reader_;
rtc::scoped_ptr<RtpHeaderParser> parser_;
- DISALLOW_COPY_AND_ASSIGN(RtpFileSource);
+ RTC_DISALLOW_COPY_AND_ASSIGN(RtpFileSource);
};
} // namespace test
diff --git a/webrtc/modules/audio_coding/neteq/tools/rtp_generator.h b/webrtc/modules/audio_coding/neteq/tools/rtp_generator.h
index e09f6e4..6c16192 100644
--- a/webrtc/modules/audio_coding/neteq/tools/rtp_generator.h
+++ b/webrtc/modules/audio_coding/neteq/tools/rtp_generator.h
@@ -54,7 +54,7 @@
double drift_factor_;
private:
- DISALLOW_COPY_AND_ASSIGN(RtpGenerator);
+ RTC_DISALLOW_COPY_AND_ASSIGN(RtpGenerator);
};
class TimestampJumpRtpGenerator : public RtpGenerator {
@@ -75,7 +75,7 @@
private:
uint32_t jump_from_timestamp_;
uint32_t jump_to_timestamp_;
- DISALLOW_COPY_AND_ASSIGN(TimestampJumpRtpGenerator);
+ RTC_DISALLOW_COPY_AND_ASSIGN(TimestampJumpRtpGenerator);
};
} // namespace test