diff options
author | Craig Topper <craig.topper@gmail.com> | 2014-03-10 03:53:12 +0000 |
---|---|---|
committer | Craig Topper <craig.topper@gmail.com> | 2014-03-10 03:53:12 +0000 |
commit | 49e139b7f7adecc29109340c8592197453245139 (patch) | |
tree | e3ba862b1ac1cde05ac7429987f811101bd93562 /lib/Support | |
parent | 292fcee823a79982c00e726482f9cd2e0bb10639 (diff) | |
download | llvm-49e139b7f7adecc29109340c8592197453245139.tar.gz llvm-49e139b7f7adecc29109340c8592197453245139.tar.bz2 llvm-49e139b7f7adecc29109340c8592197453245139.tar.xz |
[C++11] Remove 'virtual' keyword from methods marked with 'override' keyword.
git-svn-id: https://llvm.org/svn/llvm-project/llvm/trunk@203442 91177308-0d34-0410-b5e6-96231b3b80d8
Diffstat (limited to 'lib/Support')
-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 | 18 | ||||
-rw-r--r-- | lib/Support/system_error.cpp | 10 |
5 files changed, 20 insertions, 22 deletions
diff --git a/lib/Support/DAGDeltaAlgorithm.cpp b/lib/Support/DAGDeltaAlgorithm.cpp index 7b81a11351..29acb7d338 100644 --- a/lib/Support/DAGDeltaAlgorithm.cpp +++ b/lib/Support/DAGDeltaAlgorithm.cpp @@ -162,12 +162,12 @@ class DeltaActiveSetHelper : public DeltaAlgorithm { protected: /// UpdatedSearchState - Callback used when the search state changes. - virtual void UpdatedSearchState(const changeset_ty &Changes, + void UpdatedSearchState(const changeset_ty &Changes, const changesetlist_ty &Sets) override { DDAI.UpdatedSearchState(Changes, Sets, Required); } - virtual bool ExecuteOneTest(const changeset_ty &S) override { + 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 d02b83cb92..1caeddfe24 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) override { + 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 c7f76d3d7e..2d593a8f41 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 override { + const char *getBufferIdentifier() const override { // The name is stored after the class itself. return reinterpret_cast<const char*>(this + 1); } - virtual BufferKind getBufferKind() const override { + BufferKind getBufferKind() const override { return MemoryBuffer_Malloc; } }; @@ -217,12 +217,12 @@ public: } } - virtual const char *getBufferIdentifier() const override { + const char *getBufferIdentifier() const override { // The name is stored after the class itself. return reinterpret_cast<const char *>(this + 1); } - virtual BufferKind getBufferKind() const override { + BufferKind getBufferKind() const override { return MemoryBuffer_MMap; } }; diff --git a/lib/Support/StreamableMemoryObject.cpp b/lib/Support/StreamableMemoryObject.cpp index d7804e65f2..5cb0680522 100644 --- a/lib/Support/StreamableMemoryObject.cpp +++ b/lib/Support/StreamableMemoryObject.cpp @@ -25,20 +25,18 @@ public: assert(LastChar >= FirstChar && "Invalid start/end range"); } - virtual uint64_t getBase() const override { return 0; } - virtual uint64_t getExtent() const override { + uint64_t getBase() const override { return 0; } + uint64_t getExtent() const override { return LastChar - FirstChar; } - virtual int readByte(uint64_t address, uint8_t* ptr) const override; - virtual int readBytes(uint64_t address, - uint64_t size, - uint8_t *buf) const override; - virtual const uint8_t *getPointer(uint64_t address, - uint64_t size) const override; - virtual bool isValidAddress(uint64_t address) const override { + int readByte(uint64_t address, uint8_t* ptr) const override; + int readBytes(uint64_t address, uint64_t size, + uint8_t *buf) const override; + const uint8_t *getPointer(uint64_t address, uint64_t size) const override; + bool isValidAddress(uint64_t address) const override { return validAddress(address); } - virtual bool isObjectEnd(uint64_t address) const override { + 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 b4a5f678ed..299f54abb1 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 override; - virtual std::string message(int ev) const override; + const char* name() const override; + 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 override; - virtual std::string message(int ev) const override; - virtual error_condition default_error_condition(int ev) const override; + const char* name() const override; + std::string message(int ev) const override; + error_condition default_error_condition(int ev) const override; }; const char* |