diff options
author | Craig Topper <craig.topper@gmail.com> | 2014-03-02 09:09:27 +0000 |
---|---|---|
committer | Craig Topper <craig.topper@gmail.com> | 2014-03-02 09:09:27 +0000 |
commit | 629b96cb4f278cc78bfd5679e91315cb6e1ed164 (patch) | |
tree | ed28168bcd1081616aad52528cbc43a757a2e29f /lib/Support | |
parent | cfbdd4df6ddc1adff339c71dcd9731f93c5e1768 (diff) | |
download | llvm-629b96cb4f278cc78bfd5679e91315cb6e1ed164.tar.gz llvm-629b96cb4f278cc78bfd5679e91315cb6e1ed164.tar.bz2 llvm-629b96cb4f278cc78bfd5679e91315cb6e1ed164.tar.xz |
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
Diffstat (limited to 'lib/Support')
-rw-r--r-- | lib/Support/CommandLine.cpp | 2 | ||||
-rw-r--r-- | lib/Support/DAGDeltaAlgorithm.cpp | 4 | ||||
-rw-r--r-- | lib/Support/DataStream.cpp | 2 | ||||
-rw-r--r-- | lib/Support/MemoryBuffer.cpp | 8 | ||||
-rw-r--r-- | lib/Support/StreamableMemoryObject.cpp | 14 | ||||
-rw-r--r-- | lib/Support/system_error.cpp | 10 |
6 files changed, 20 insertions, 20 deletions
diff --git a/lib/Support/CommandLine.cpp b/lib/Support/CommandLine.cpp index e94206ee3d..6d962e6496 100644 --- a/lib/Support/CommandLine.cpp +++ b/lib/Support/CommandLine.cpp @@ -689,7 +689,7 @@ namespace { free(Dup); } } - const char *SaveString(const char *Str) LLVM_OVERRIDE { + const char *SaveString(const char *Str) override { char *Dup = strdup(Str); Dups.push_back(Dup); return Dup; diff --git a/lib/Support/DAGDeltaAlgorithm.cpp b/lib/Support/DAGDeltaAlgorithm.cpp index 34e82cf441..7b81a11351 100644 --- a/lib/Support/DAGDeltaAlgorithm.cpp +++ b/lib/Support/DAGDeltaAlgorithm.cpp @@ -163,11 +163,11 @@ class DeltaActiveSetHelper : public DeltaAlgorithm { protected: /// UpdatedSearchState - Callback used when the search state changes. virtual void UpdatedSearchState(const changeset_ty &Changes, - const changesetlist_ty &Sets) LLVM_OVERRIDE { + const changesetlist_ty &Sets) override { DDAI.UpdatedSearchState(Changes, Sets, Required); } - virtual bool ExecuteOneTest(const changeset_ty &S) LLVM_OVERRIDE { + virtual bool ExecuteOneTest(const changeset_ty &S) override { return DDAI.GetTestResult(S, Required); } diff --git a/lib/Support/DataStream.cpp b/lib/Support/DataStream.cpp index 0bd0c68702..d02b83cb92 100644 --- a/lib/Support/DataStream.cpp +++ b/lib/Support/DataStream.cpp @@ -58,7 +58,7 @@ public: virtual ~DataFileStreamer() { close(Fd); } - virtual size_t GetBytes(unsigned char *buf, size_t len) LLVM_OVERRIDE { + virtual size_t GetBytes(unsigned char *buf, size_t len) override { NumStreamFetches++; return read(Fd, buf, len); } diff --git a/lib/Support/MemoryBuffer.cpp b/lib/Support/MemoryBuffer.cpp index 33beba7792..ecae7695e1 100644 --- a/lib/Support/MemoryBuffer.cpp +++ b/lib/Support/MemoryBuffer.cpp @@ -91,12 +91,12 @@ public: init(InputData.begin(), InputData.end(), RequiresNullTerminator); } - virtual const char *getBufferIdentifier() const LLVM_OVERRIDE { + virtual const char *getBufferIdentifier() const override { // The name is stored after the class itself. return reinterpret_cast<const char*>(this + 1); } - virtual BufferKind getBufferKind() const LLVM_OVERRIDE { + virtual BufferKind getBufferKind() const override { return MemoryBuffer_Malloc; } }; @@ -207,12 +207,12 @@ public: } } - virtual const char *getBufferIdentifier() const LLVM_OVERRIDE { + virtual const char *getBufferIdentifier() const override { // The name is stored after the class itself. return reinterpret_cast<const char *>(this + 1); } - virtual BufferKind getBufferKind() const LLVM_OVERRIDE { + virtual BufferKind getBufferKind() const override { return MemoryBuffer_MMap; } }; diff --git a/lib/Support/StreamableMemoryObject.cpp b/lib/Support/StreamableMemoryObject.cpp index 2ed7c5c100..2cc87fc1ab 100644 --- a/lib/Support/StreamableMemoryObject.cpp +++ b/lib/Support/StreamableMemoryObject.cpp @@ -24,20 +24,20 @@ public: assert(LastChar >= FirstChar && "Invalid start/end range"); } - virtual uint64_t getBase() const LLVM_OVERRIDE { return 0; } - virtual uint64_t getExtent() const LLVM_OVERRIDE { + virtual uint64_t getBase() const override { return 0; } + virtual uint64_t getExtent() const override { return LastChar - FirstChar; } - virtual int readByte(uint64_t address, uint8_t* ptr) const LLVM_OVERRIDE; + virtual int readByte(uint64_t address, uint8_t* ptr) const override; virtual int readBytes(uint64_t address, uint64_t size, - uint8_t *buf) const LLVM_OVERRIDE; + uint8_t *buf) const override; virtual const uint8_t *getPointer(uint64_t address, - uint64_t size) const LLVM_OVERRIDE; - virtual bool isValidAddress(uint64_t address) const LLVM_OVERRIDE { + uint64_t size) const override; + virtual bool isValidAddress(uint64_t address) const override { return validAddress(address); } - virtual bool isObjectEnd(uint64_t address) const LLVM_OVERRIDE { + virtual bool isObjectEnd(uint64_t address) const override { return objectEnd(address); } diff --git a/lib/Support/system_error.cpp b/lib/Support/system_error.cpp index b22745afc3..b4a5f678ed 100644 --- a/lib/Support/system_error.cpp +++ b/lib/Support/system_error.cpp @@ -48,8 +48,8 @@ _do_message::message(int ev) const { class _generic_error_category : public _do_message { public: - virtual const char* name() const LLVM_OVERRIDE; - virtual std::string message(int ev) const LLVM_OVERRIDE; + virtual const char* name() const override; + virtual std::string message(int ev) const override; }; const char* @@ -74,9 +74,9 @@ generic_category() { class _system_error_category : public _do_message { public: - virtual const char* name() const LLVM_OVERRIDE; - virtual std::string message(int ev) const LLVM_OVERRIDE; - virtual error_condition default_error_condition(int ev) const LLVM_OVERRIDE; + virtual const char* name() const override; + virtual std::string message(int ev) const override; + virtual error_condition default_error_condition(int ev) const override; }; const char* |