Merge changes If4de1e1f,I11493096,I256c7758

* changes:
  Remove 'virtual' and 'override' qualifiers on final methods.
  Remove superfluous 'virtual' specifiers in ART.
  Use 'final' and 'override' specifiers directly in ART.

1 files changed, 5 insertions, 5 deletions

diff --git a/compiler/linker/file_output_stream.h b/compiler/linker/file_output_stream.h
index deb051fca4..1417132981 100644
--- a/compiler/linker/file_output_stream.h
+++ b/compiler/linker/file_output_stream.h
@@ -24,17 +24,17 @@
 namespace art {
 namespace linker {
 
-class FileOutputStream FINAL : public OutputStream {
+class FileOutputStream final : public OutputStream {
  public:
   explicit FileOutputStream(File* file);
 
-  ~FileOutputStream() OVERRIDE {}
+  ~FileOutputStream() override {}
 
-  bool WriteFully(const void* buffer, size_t byte_count) OVERRIDE;
+  bool WriteFully(const void* buffer, size_t byte_count) override;
 
-  off_t Seek(off_t offset, Whence whence) OVERRIDE;
+  off_t Seek(off_t offset, Whence whence) override;
 
-  bool Flush() OVERRIDE;
+  bool Flush() override;
 
  private:
   File* const file_;