From 629b96cb4f278cc78bfd5679e91315cb6e1ed164 Mon Sep 17 00:00:00 2001 From: Craig Topper Date: Sun, 2 Mar 2014 09:09:27 +0000 Subject: Switch all uses of LLVM_OVERRIDE to just use 'override' directly. git-svn-id: https://llvm.org/svn/llvm-project/llvm/trunk@202621 91177308-0d34-0410-b5e6-96231b3b80d8 --- include/llvm/Object/COFF.h | 116 ++++++++++++++++++++------------------------- 1 file changed, 52 insertions(+), 64 deletions(-) (limited to 'include/llvm/Object/COFF.h') diff --git a/include/llvm/Object/COFF.h b/include/llvm/Object/COFF.h index 7ca7c43668..6bf059b9ea 100644 --- a/include/llvm/Object/COFF.h +++ b/include/llvm/Object/COFF.h @@ -300,82 +300,70 @@ private: error_code initExportTablePtr(); protected: - void moveSymbolNext(DataRefImpl &Symb) const LLVM_OVERRIDE; - error_code getSymbolName(DataRefImpl Symb, StringRef &Res) const - LLVM_OVERRIDE; - error_code getSymbolAddress(DataRefImpl Symb, uint64_t &Res) const - LLVM_OVERRIDE; - error_code getSymbolFileOffset(DataRefImpl Symb, uint64_t &Res) const - LLVM_OVERRIDE; - error_code getSymbolSize(DataRefImpl Symb, uint64_t &Res) const LLVM_OVERRIDE; - uint32_t getSymbolFlags(DataRefImpl Symb) const LLVM_OVERRIDE; - error_code getSymbolType(DataRefImpl Symb, SymbolRef::Type &Res) const - LLVM_OVERRIDE; - error_code getSymbolSection(DataRefImpl Symb, section_iterator &Res) const - LLVM_OVERRIDE; - error_code getSymbolValue(DataRefImpl Symb, uint64_t &Val) const - LLVM_OVERRIDE; - void moveSectionNext(DataRefImpl &Sec) const LLVM_OVERRIDE; - error_code getSectionName(DataRefImpl Sec, StringRef &Res) const - LLVM_OVERRIDE; - error_code getSectionAddress(DataRefImpl Sec, uint64_t &Res) const - LLVM_OVERRIDE; - error_code getSectionSize(DataRefImpl Sec, uint64_t &Res) const LLVM_OVERRIDE; - error_code getSectionContents(DataRefImpl Sec, StringRef &Res) const - LLVM_OVERRIDE; - error_code getSectionAlignment(DataRefImpl Sec, uint64_t &Res) const - LLVM_OVERRIDE; - error_code isSectionText(DataRefImpl Sec, bool &Res) const LLVM_OVERRIDE; - error_code isSectionData(DataRefImpl Sec, bool &Res) const LLVM_OVERRIDE; - error_code isSectionBSS(DataRefImpl Sec, bool &Res) const LLVM_OVERRIDE; - error_code isSectionVirtual(DataRefImpl Sec, bool &Res) const LLVM_OVERRIDE; - error_code isSectionZeroInit(DataRefImpl Sec, bool &Res) const LLVM_OVERRIDE; - error_code isSectionReadOnlyData(DataRefImpl Sec, bool &Res) const - LLVM_OVERRIDE; - error_code isSectionRequiredForExecution(DataRefImpl Sec, bool &Res) const - LLVM_OVERRIDE; + void moveSymbolNext(DataRefImpl &Symb) const override; + error_code getSymbolName(DataRefImpl Symb, StringRef &Res) const override; + error_code getSymbolAddress(DataRefImpl Symb, uint64_t &Res) const override; + error_code getSymbolFileOffset(DataRefImpl Symb, + uint64_t &Res) const override; + error_code getSymbolSize(DataRefImpl Symb, uint64_t &Res) const override; + uint32_t getSymbolFlags(DataRefImpl Symb) const override; + error_code getSymbolType(DataRefImpl Symb, + SymbolRef::Type &Res) const override; + error_code getSymbolSection(DataRefImpl Symb, + section_iterator &Res) const override; + error_code getSymbolValue(DataRefImpl Symb, uint64_t &Val) const override; + void moveSectionNext(DataRefImpl &Sec) const override; + error_code getSectionName(DataRefImpl Sec, StringRef &Res) const override; + error_code getSectionAddress(DataRefImpl Sec, uint64_t &Res) const override; + error_code getSectionSize(DataRefImpl Sec, uint64_t &Res) const override; + error_code getSectionContents(DataRefImpl Sec, StringRef &Res) const override; + error_code getSectionAlignment(DataRefImpl Sec, uint64_t &Res) const override; + error_code isSectionText(DataRefImpl Sec, bool &Res) const override; + error_code isSectionData(DataRefImpl Sec, bool &Res) const override; + error_code isSectionBSS(DataRefImpl Sec, bool &Res) const override; + error_code isSectionVirtual(DataRefImpl Sec, bool &Res) const override; + error_code isSectionZeroInit(DataRefImpl Sec, bool &Res) const override; + error_code isSectionReadOnlyData(DataRefImpl Sec, bool &Res) const override; + error_code isSectionRequiredForExecution(DataRefImpl Sec, + bool &Res) const override; error_code sectionContainsSymbol(DataRefImpl Sec, DataRefImpl Symb, - bool &Result) const LLVM_OVERRIDE; - relocation_iterator section_rel_begin(DataRefImpl Sec) const LLVM_OVERRIDE; - relocation_iterator section_rel_end(DataRefImpl Sec) const LLVM_OVERRIDE; - - void moveRelocationNext(DataRefImpl &Rel) const LLVM_OVERRIDE; - error_code getRelocationAddress(DataRefImpl Rel, uint64_t &Res) const - LLVM_OVERRIDE; - error_code getRelocationOffset(DataRefImpl Rel, uint64_t &Res) const - LLVM_OVERRIDE; - symbol_iterator getRelocationSymbol(DataRefImpl Rel) const LLVM_OVERRIDE; - error_code getRelocationType(DataRefImpl Rel, uint64_t &Res) const - LLVM_OVERRIDE; + bool &Result) const override; + relocation_iterator section_rel_begin(DataRefImpl Sec) const override; + relocation_iterator section_rel_end(DataRefImpl Sec) const override; + + void moveRelocationNext(DataRefImpl &Rel) const override; + error_code getRelocationAddress(DataRefImpl Rel, + uint64_t &Res) const override; + error_code getRelocationOffset(DataRefImpl Rel, uint64_t &Res) const override; + symbol_iterator getRelocationSymbol(DataRefImpl Rel) const override; + error_code getRelocationType(DataRefImpl Rel, uint64_t &Res) const override; error_code getRelocationTypeName(DataRefImpl Rel, - SmallVectorImpl &Result) const - LLVM_OVERRIDE; + SmallVectorImpl &Result) const override; error_code getRelocationValueString(DataRefImpl Rel, - SmallVectorImpl &Result) const - LLVM_OVERRIDE; + SmallVectorImpl &Result) const override; - error_code getLibraryNext(DataRefImpl LibData, LibraryRef &Result) const - LLVM_OVERRIDE; - error_code getLibraryPath(DataRefImpl LibData, StringRef &Result) const - LLVM_OVERRIDE; + error_code getLibraryNext(DataRefImpl LibData, + LibraryRef &Result) const override; + error_code getLibraryPath(DataRefImpl LibData, + StringRef &Result) const override; public: COFFObjectFile(MemoryBuffer *Object, error_code &EC, bool BufferOwned = true); - basic_symbol_iterator symbol_begin_impl() const LLVM_OVERRIDE; - basic_symbol_iterator symbol_end_impl() const LLVM_OVERRIDE; - library_iterator needed_library_begin() const LLVM_OVERRIDE; - library_iterator needed_library_end() const LLVM_OVERRIDE; - section_iterator section_begin() const LLVM_OVERRIDE; - section_iterator section_end() const LLVM_OVERRIDE; + basic_symbol_iterator symbol_begin_impl() const override; + basic_symbol_iterator symbol_end_impl() const override; + library_iterator needed_library_begin() const override; + library_iterator needed_library_end() const override; + section_iterator section_begin() const override; + section_iterator section_end() const override; const coff_section *getCOFFSection(section_iterator &It) const; const coff_symbol *getCOFFSymbol(symbol_iterator &It) const; const coff_relocation *getCOFFRelocation(relocation_iterator &It) const; - uint8_t getBytesInAddress() const LLVM_OVERRIDE; - StringRef getFileFormatName() const LLVM_OVERRIDE; - unsigned getArch() const LLVM_OVERRIDE; - StringRef getLoadName() const LLVM_OVERRIDE; + uint8_t getBytesInAddress() const override; + StringRef getFileFormatName() const override; + unsigned getArch() const override; + StringRef getLoadName() const override; import_directory_iterator import_directory_begin() const; import_directory_iterator import_directory_end() const; -- cgit v1.2.3