summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorChandler Carruth <chandlerc@gmail.com>2014-03-02 09:39:44 +0000
committerChandler Carruth <chandlerc@gmail.com>2014-03-02 09:39:44 +0000
commit5de228b28716ff0bb2f29b45e96334b535457fe7 (patch)
tree8e57367cbec2309bb5e24c0b8a18dc8c5c05b627
parent6eface7c9d4c37618201583ff2f3347fa2be884f (diff)
downloadbcm5719-llvm-5de228b28716ff0bb2f29b45e96334b535457fe7.tar.gz
bcm5719-llvm-5de228b28716ff0bb2f29b45e96334b535457fe7.zip
[C++11] Replace LLVM_OVERRIDE with just "override" now that we're all
using MSVC 2012 or newer. llvm-svn: 202627
-rw-r--r--lld/lib/ReaderWriter/ELF/ArrayOrderPass.h2
-rw-r--r--lld/lib/ReaderWriter/ELF/Atoms.h2
-rw-r--r--lld/lib/ReaderWriter/ELF/SectionChunks.h6
-rw-r--r--lld/lib/ReaderWriter/MachO/StubAtoms.hpp2
4 files changed, 6 insertions, 6 deletions
diff --git a/lld/lib/ReaderWriter/ELF/ArrayOrderPass.h b/lld/lib/ReaderWriter/ELF/ArrayOrderPass.h
index 12cce561fbf..033348d78ba 100644
--- a/lld/lib/ReaderWriter/ELF/ArrayOrderPass.h
+++ b/lld/lib/ReaderWriter/ELF/ArrayOrderPass.h
@@ -18,7 +18,7 @@ namespace elf {
class ArrayOrderPass : public Pass {
public:
ArrayOrderPass() : Pass() {}
- virtual void perform(std::unique_ptr<MutableFile> &mergedFile) LLVM_OVERRIDE;
+ virtual void perform(std::unique_ptr<MutableFile> &mergedFile) override;
};
}
}
diff --git a/lld/lib/ReaderWriter/ELF/Atoms.h b/lld/lib/ReaderWriter/ELF/Atoms.h
index 4290c3ba185..7dcaed8d6e1 100644
--- a/lld/lib/ReaderWriter/ELF/Atoms.h
+++ b/lld/lib/ReaderWriter/ELF/Atoms.h
@@ -698,7 +698,7 @@ public:
}
}
- virtual uint64_t size() const LLVM_OVERRIDE {
+ virtual uint64_t size() const override {
return _symbol->st_size;
}
diff --git a/lld/lib/ReaderWriter/ELF/SectionChunks.h b/lld/lib/ReaderWriter/ELF/SectionChunks.h
index b978f62c6cb..66f3d85971e 100644
--- a/lld/lib/ReaderWriter/ELF/SectionChunks.h
+++ b/lld/lib/ReaderWriter/ELF/SectionChunks.h
@@ -1345,17 +1345,17 @@ public:
this->_msize = this->_fsize;
}
- virtual void doPreFlight() LLVM_OVERRIDE {
+ virtual void doPreFlight() override {
// TODO: Generate a proper binary search table.
}
- virtual void finalize() LLVM_OVERRIDE {
+ virtual void finalize() override {
MergedSections<ELFT> *s = _layout.findOutputSection(".eh_frame");
_ehFrameAddr = s ? s->virtualAddr() : 0;
}
virtual void write(ELFWriter *writer, TargetLayout<ELFT> &layout,
- llvm::FileOutputBuffer &buffer) LLVM_OVERRIDE {
+ llvm::FileOutputBuffer &buffer) override {
uint8_t *chunkBuffer = buffer.getBufferStart();
uint8_t *dest = chunkBuffer + this->fileOffset();
int pos = 0;
diff --git a/lld/lib/ReaderWriter/MachO/StubAtoms.hpp b/lld/lib/ReaderWriter/MachO/StubAtoms.hpp
index daf7e7b3d0a..bc207b11df0 100644
--- a/lld/lib/ReaderWriter/MachO/StubAtoms.hpp
+++ b/lld/lib/ReaderWriter/MachO/StubAtoms.hpp
@@ -54,7 +54,7 @@ public:
return Type::Unknown;
}
- virtual uint64_t size() const LLVM_OVERRIDE {
+ virtual uint64_t size() const override {
return 0;
}
OpenPOWER on IntegriCloud