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/gain_control_impl.h b/webrtc/modules/audio_processing/gain_control_impl.h
index 8115987..d648943 100644
--- a/webrtc/modules/audio_processing/gain_control_impl.h
+++ b/webrtc/modules/audio_processing/gain_control_impl.h
@@ -33,36 +33,36 @@
int ProcessCaptureAudio(AudioBuffer* audio);
// ProcessingComponent implementation.
- virtual int Initialize() OVERRIDE;
+ int Initialize() override;
// GainControl implementation.
- virtual bool is_enabled() const OVERRIDE;
- virtual int stream_analog_level() OVERRIDE;
+ bool is_enabled() const override;
+ int stream_analog_level() override;
private:
// GainControl implementation.
- virtual int Enable(bool enable) OVERRIDE;
- virtual int set_stream_analog_level(int level) OVERRIDE;
- virtual int set_mode(Mode mode) OVERRIDE;
- virtual Mode mode() const OVERRIDE;
- virtual int set_target_level_dbfs(int level) OVERRIDE;
- virtual int target_level_dbfs() const OVERRIDE;
- virtual int set_compression_gain_db(int gain) OVERRIDE;
- virtual int compression_gain_db() const OVERRIDE;
- virtual int enable_limiter(bool enable) OVERRIDE;
- virtual bool is_limiter_enabled() const OVERRIDE;
- virtual int set_analog_level_limits(int minimum, int maximum) OVERRIDE;
- virtual int analog_level_minimum() const OVERRIDE;
- virtual int analog_level_maximum() const OVERRIDE;
- virtual bool stream_is_saturated() const OVERRIDE;
+ int Enable(bool enable) override;
+ int set_stream_analog_level(int level) override;
+ int set_mode(Mode mode) override;
+ Mode mode() const override;
+ int set_target_level_dbfs(int level) override;
+ int target_level_dbfs() const override;
+ int set_compression_gain_db(int gain) override;
+ int compression_gain_db() const override;
+ int enable_limiter(bool enable) override;
+ bool is_limiter_enabled() const override;
+ int set_analog_level_limits(int minimum, int maximum) override;
+ int analog_level_minimum() const override;
+ int analog_level_maximum() const override;
+ bool stream_is_saturated() const override;
// ProcessingComponent implementation.
- virtual void* CreateHandle() const OVERRIDE;
- virtual int InitializeHandle(void* handle) const OVERRIDE;
- virtual int ConfigureHandle(void* handle) const OVERRIDE;
- virtual void DestroyHandle(void* handle) const OVERRIDE;
- virtual int num_handles_required() const OVERRIDE;
- virtual int GetHandleError(void* handle) const OVERRIDE;
+ void* CreateHandle() const override;
+ int InitializeHandle(void* handle) const override;
+ int ConfigureHandle(void* handle) const override;
+ void DestroyHandle(void* handle) const override;
+ int num_handles_required() const override;
+ int GetHandleError(void* handle) const override;
const AudioProcessing* apm_;
CriticalSectionWrapper* crit_;