zqz/platform-external-webrtc
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Add RTC_ prefix to contructormagic macros.

Browse Source 
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}
This commit is contained in:
henrikg
2015-09-16 05:37:44 -07:00
committed by Commit bot
parent afb6b5e3e0
commit 3c089d751e
258 changed files with 411 additions and 418 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
webrtc/modules/audio_coding/codecs/audio_decoder.h
View File

@ -115,7 +115,7 @@ class AudioDecoder {
SpeechType* speech_type);
private:
DISALLOW_COPY_AND_ASSIGN(AudioDecoder);
RTC_DISALLOW_COPY_AND_ASSIGN(AudioDecoder);
};
} // namespace webrtc

4
webrtc/modules/audio_coding/codecs/isac/audio_encoder_isac_t.h
View File

@ -91,7 +91,7 @@ class AudioEncoderIsacT final : public AudioEncoder {
// 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 @@ class AudioDecoderIsacT final : public AudioDecoder {
LockedIsacBandwidthInfo* bwinfo_;
int decoder_sample_rate_hz_;
DISALLOW_COPY_AND_ASSIGN(AudioDecoderIsacT);
RTC_DISALLOW_COPY_AND_ASSIGN(AudioDecoderIsacT);
};
} // namespace webrtc

2
webrtc/modules/audio_coding/codecs/opus/interface/audio_decoder_opus.h
View File

@ -43,7 +43,7 @@ class AudioDecoderOpus : public AudioDecoder {
private:
OpusDecInst* dec_state_;
const size_t channels_;
DISALLOW_COPY_AND_ASSIGN(AudioDecoderOpus);
RTC_DISALLOW_COPY_AND_ASSIGN(AudioDecoderOpus);
};
} // namespace webrtc