Roll chromium_revision e144d30..6fdb142 (318658:318841) + remove OVERRIDE macro
Clang version changed 223108:230914
Details: https://chromium.googlesource.com/chromium/src/+/e144d30..6fdb142/tools/clang/scripts/update.sh
Removes the OVERRIDE macro defined in:
* webrtc/base/common.h
* webrtc/typedefs.h
The majority of the source changes were done by running this in src/:
perl -0pi -e "s/virtual\s([^({;]*(\([^({;]*\)[^({;]*))(OVERRIDE|override)/\1override/sg" `find {talk,webrtc} -name "*.h" -o -name "*.cc*" -o -name "*.mm*"`
which converted all:
virtual Foo() OVERRIDE
functions to:
Foo() override
Then I manually edited:
* talk/media/webrtc/fakewebrtccommon.h
* webrtc/test/fake_common.h
Remaining uses of OVERRIDE was fixed by search+replace.
Manual edits were done to fix virtual destructors that were
overriding inherited ones.
Finally a build error related to the pure virtual definitions of
Read, Write and Rewind in common_types.h required a bit of
refactoring in:
* webrtc/common_types.cc
* webrtc/common_types.h
* webrtc/system_wrappers/interface/file_wrapper.h
* webrtc/system_wrappers/source/file_impl.cc
This roll should make it possible for us to finally re-enable deadlock
detection for TSan on the buildbots.
BUG=4106
R=pbos@webrtc.org, tommi@webrtc.org
Review URL: https://webrtc-codereview.appspot.com/41069004
Cr-Commit-Position: refs/heads/master@{#8596}
git-svn-id: http://webrtc.googlecode.com/svn/trunk@8596 4adac7df-926f-26a2-2b94-8c16560cd09d
diff --git a/webrtc/modules/audio_processing/audio_processing_impl.cc b/webrtc/modules/audio_processing/audio_processing_impl.cc
index 5029bc7..200aa8b 100644
--- a/webrtc/modules/audio_processing/audio_processing_impl.cc
+++ b/webrtc/modules/audio_processing/audio_processing_impl.cc
@@ -75,60 +75,49 @@
}
// GainControl implementation.
- virtual int Enable(bool enable) OVERRIDE {
+ int Enable(bool enable) override {
return real_gain_control_->Enable(enable);
}
- virtual bool is_enabled() const OVERRIDE {
- return real_gain_control_->is_enabled();
- }
- virtual int set_stream_analog_level(int level) OVERRIDE {
+ bool is_enabled() const override { return real_gain_control_->is_enabled(); }
+ int set_stream_analog_level(int level) override {
volume_ = level;
return AudioProcessing::kNoError;
}
- virtual int stream_analog_level() OVERRIDE {
- return volume_;
- }
- virtual int set_mode(Mode mode) OVERRIDE { return AudioProcessing::kNoError; }
- virtual Mode mode() const OVERRIDE { return GainControl::kAdaptiveAnalog; }
- virtual int set_target_level_dbfs(int level) OVERRIDE {
+ int stream_analog_level() override { return volume_; }
+ int set_mode(Mode mode) override { return AudioProcessing::kNoError; }
+ Mode mode() const override { return GainControl::kAdaptiveAnalog; }
+ int set_target_level_dbfs(int level) override {
return AudioProcessing::kNoError;
}
- virtual int target_level_dbfs() const OVERRIDE {
+ int target_level_dbfs() const override {
return real_gain_control_->target_level_dbfs();
}
- virtual int set_compression_gain_db(int gain) OVERRIDE {
+ int set_compression_gain_db(int gain) override {
return AudioProcessing::kNoError;
}
- virtual int compression_gain_db() const OVERRIDE {
+ int compression_gain_db() const override {
return real_gain_control_->compression_gain_db();
}
- virtual int enable_limiter(bool enable) OVERRIDE {
- return AudioProcessing::kNoError;
- }
- virtual bool is_limiter_enabled() const OVERRIDE {
+ int enable_limiter(bool enable) override { return AudioProcessing::kNoError; }
+ bool is_limiter_enabled() const override {
return real_gain_control_->is_limiter_enabled();
}
- virtual int set_analog_level_limits(int minimum,
- int maximum) OVERRIDE {
+ int set_analog_level_limits(int minimum, int maximum) override {
return AudioProcessing::kNoError;
}
- virtual int analog_level_minimum() const OVERRIDE {
+ int analog_level_minimum() const override {
return real_gain_control_->analog_level_minimum();
}
- virtual int analog_level_maximum() const OVERRIDE {
+ int analog_level_maximum() const override {
return real_gain_control_->analog_level_maximum();
}
- virtual bool stream_is_saturated() const OVERRIDE {
+ bool stream_is_saturated() const override {
return real_gain_control_->stream_is_saturated();
}
// VolumeCallbacks implementation.
- virtual void SetMicVolume(int volume) OVERRIDE {
- volume_ = volume;
- }
- virtual int GetMicVolume() OVERRIDE {
- return volume_;
- }
+ void SetMicVolume(int volume) override { volume_ = volume; }
+ int GetMicVolume() override { return volume_; }
private:
GainControl* real_gain_control_;