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/system_wrappers/source/file_impl.h b/webrtc/system_wrappers/source/file_impl.h
index 26e9d4d..e6679aa 100644
--- a/webrtc/system_wrappers/source/file_impl.h
+++ b/webrtc/system_wrappers/source/file_impl.h
@@ -23,31 +23,30 @@
class FileWrapperImpl : public FileWrapper {
public:
FileWrapperImpl();
- virtual ~FileWrapperImpl();
+ ~FileWrapperImpl() override;
- virtual int FileName(char* file_name_utf8,
- size_t size) const OVERRIDE;
+ int FileName(char* file_name_utf8, size_t size) const override;
- virtual bool Open() const OVERRIDE;
+ bool Open() const override;
- virtual int OpenFile(const char* file_name_utf8,
- bool read_only,
- bool loop = false,
- bool text = false) OVERRIDE;
+ int OpenFile(const char* file_name_utf8,
+ bool read_only,
+ bool loop = false,
+ bool text = false) override;
- virtual int OpenFromFileHandle(FILE* handle,
- bool manage_file,
- bool read_only,
- bool loop = false) OVERRIDE;
+ int OpenFromFileHandle(FILE* handle,
+ bool manage_file,
+ bool read_only,
+ bool loop = false) override;
- virtual int CloseFile() OVERRIDE;
- virtual int SetMaxFileSize(size_t bytes) OVERRIDE;
- virtual int Flush() OVERRIDE;
+ int CloseFile() override;
+ int SetMaxFileSize(size_t bytes) override;
+ int Flush() override;
- virtual int Read(void* buf, size_t length) OVERRIDE;
- virtual bool Write(const void* buf, size_t length) OVERRIDE;
- virtual int WriteText(const char* format, ...) OVERRIDE;
- virtual int Rewind() OVERRIDE;
+ int Read(void* buf, size_t length) override;
+ bool Write(const void* buf, size_t length) override;
+ int WriteText(const char* format, ...) override;
+ int Rewind() override;
private:
int CloseFileImpl();