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-Original-Commit-Position: refs/heads/master@{#8596}
Cr-Mirrored-From: https://chromium.googlesource.com/external/webrtc
Cr-Mirrored-Commit: 14665ff7d4024d07e58622f498b23fd980001871
diff --git a/modules/media_file/source/media_file_impl.h b/modules/media_file/source/media_file_impl.h
index 9b14a86..c5038bb 100644
--- a/modules/media_file/source/media_file_impl.h
+++ b/modules/media_file/source/media_file_impl.h
@@ -26,72 +26,71 @@
MediaFileImpl(const int32_t id);
~MediaFileImpl();
- virtual int32_t Process() OVERRIDE;
- virtual int64_t TimeUntilNextProcess() OVERRIDE;
+ int32_t Process() override;
+ int64_t TimeUntilNextProcess() override;
// MediaFile functions
- virtual int32_t PlayoutAudioData(int8_t* audioBuffer,
- size_t& dataLengthInBytes) OVERRIDE;
+ int32_t PlayoutAudioData(int8_t* audioBuffer,
+ size_t& dataLengthInBytes) override;
- virtual int32_t PlayoutStereoData(int8_t* audioBufferLeft,
- int8_t* audioBufferRight,
- size_t& dataLengthInBytes) OVERRIDE;
+ int32_t PlayoutStereoData(int8_t* audioBufferLeft,
+ int8_t* audioBufferRight,
+ size_t& dataLengthInBytes) override;
- virtual int32_t StartPlayingAudioFile(
- const char* fileName,
+ int32_t StartPlayingAudioFile(
+ const char* fileName,
const uint32_t notificationTimeMs = 0,
- const bool loop = false,
- const FileFormats format = kFileFormatPcm16kHzFile,
- const CodecInst* codecInst = NULL,
+ const bool loop = false,
+ const FileFormats format = kFileFormatPcm16kHzFile,
+ const CodecInst* codecInst = NULL,
const uint32_t startPointMs = 0,
- const uint32_t stopPointMs = 0) OVERRIDE;
+ const uint32_t stopPointMs = 0) override;
- virtual int32_t StartPlayingAudioStream(InStream& stream,
+ int32_t StartPlayingAudioStream(
+ InStream& stream,
const uint32_t notificationTimeMs = 0,
const FileFormats format = kFileFormatPcm16kHzFile,
const CodecInst* codecInst = NULL,
const uint32_t startPointMs = 0,
- const uint32_t stopPointMs = 0) OVERRIDE;
+ const uint32_t stopPointMs = 0) override;
- virtual int32_t StopPlaying() OVERRIDE;
+ int32_t StopPlaying() override;
- virtual bool IsPlaying() OVERRIDE;
+ bool IsPlaying() override;
- virtual int32_t PlayoutPositionMs(uint32_t& positionMs) const OVERRIDE;
+ int32_t PlayoutPositionMs(uint32_t& positionMs) const override;
- virtual int32_t IncomingAudioData(const int8_t* audioBuffer,
- const size_t bufferLength) OVERRIDE;
+ int32_t IncomingAudioData(const int8_t* audioBuffer,
+ const size_t bufferLength) override;
- virtual int32_t StartRecordingAudioFile(
- const char* fileName,
- const FileFormats format,
- const CodecInst& codecInst,
- const uint32_t notificationTimeMs = 0,
- const uint32_t maxSizeBytes = 0) OVERRIDE;
+ int32_t StartRecordingAudioFile(const char* fileName,
+ const FileFormats format,
+ const CodecInst& codecInst,
+ const uint32_t notificationTimeMs = 0,
+ const uint32_t maxSizeBytes = 0) override;
- virtual int32_t StartRecordingAudioStream(
- OutStream& stream,
- const FileFormats format,
- const CodecInst& codecInst,
- const uint32_t notificationTimeMs = 0) OVERRIDE;
+ int32_t StartRecordingAudioStream(
+ OutStream& stream,
+ const FileFormats format,
+ const CodecInst& codecInst,
+ const uint32_t notificationTimeMs = 0) override;
- virtual int32_t StopRecording() OVERRIDE;
+ int32_t StopRecording() override;
- virtual bool IsRecording() OVERRIDE;
+ bool IsRecording() override;
- virtual int32_t RecordDurationMs(uint32_t& durationMs) OVERRIDE;
+ int32_t RecordDurationMs(uint32_t& durationMs) override;
- virtual bool IsStereo() OVERRIDE;
+ bool IsStereo() override;
- virtual int32_t SetModuleFileCallback(FileCallback* callback) OVERRIDE;
+ int32_t SetModuleFileCallback(FileCallback* callback) override;
- virtual int32_t FileDurationMs(
- const char* fileName,
- uint32_t& durationMs,
- const FileFormats format,
- const uint32_t freqInHz = 16000) OVERRIDE;
+ int32_t FileDurationMs(const char* fileName,
+ uint32_t& durationMs,
+ const FileFormats format,
+ const uint32_t freqInHz = 16000) override;
- virtual int32_t codec_info(CodecInst& codecInst) const OVERRIDE;
+ int32_t codec_info(CodecInst& codecInst) const override;
private:
// Returns true if the combination of format and codecInst is valid.
