diff options
author | Stephen Hines <srhines@google.com> | 2014-04-23 16:57:46 -0700 |
---|---|---|
committer | Stephen Hines <srhines@google.com> | 2014-04-24 15:53:16 -0700 |
commit | 36b56886974eae4f9c5ebc96befd3e7bfe5de338 (patch) | |
tree | e6cfb69fbbd937f450eeb83bfb83b9da3b01275a /lib/Support/StreamableMemoryObject.cpp | |
parent | 69a8640022b04415ae9fac62f8ab090601d8f889 (diff) | |
download | external_llvm-36b56886974eae4f9c5ebc96befd3e7bfe5de338.tar.gz external_llvm-36b56886974eae4f9c5ebc96befd3e7bfe5de338.tar.bz2 external_llvm-36b56886974eae4f9c5ebc96befd3e7bfe5de338.zip |
Update to LLVM 3.5a.
Change-Id: Ifadecab779f128e62e430c2b4f6ddd84953ed617
Diffstat (limited to 'lib/Support/StreamableMemoryObject.cpp')
-rw-r--r-- | lib/Support/StreamableMemoryObject.cpp | 23 |
1 files changed, 11 insertions, 12 deletions
diff --git a/lib/Support/StreamableMemoryObject.cpp b/lib/Support/StreamableMemoryObject.cpp index 2ed7c5c100..5cb0680522 100644 --- a/lib/Support/StreamableMemoryObject.cpp +++ b/lib/Support/StreamableMemoryObject.cpp @@ -10,6 +10,7 @@ #include "llvm/Support/StreamableMemoryObject.h" #include "llvm/Support/Compiler.h" #include <cassert> +#include <cstddef> #include <cstring> @@ -24,20 +25,18 @@ public: assert(LastChar >= FirstChar && "Invalid start/end range"); } - virtual uint64_t getBase() const LLVM_OVERRIDE { return 0; } - virtual uint64_t getExtent() const LLVM_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 LLVM_OVERRIDE; - virtual int readBytes(uint64_t address, - uint64_t size, - uint8_t *buf) const LLVM_OVERRIDE; - virtual const uint8_t *getPointer(uint64_t address, - uint64_t size) const LLVM_OVERRIDE; - virtual bool isValidAddress(uint64_t address) const LLVM_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 LLVM_OVERRIDE { + bool isObjectEnd(uint64_t address) const override { return objectEnd(address); } @@ -48,10 +47,10 @@ private: // These are implemented as inline functions here to avoid multiple virtual // calls per public function bool validAddress(uint64_t address) const { - return static_cast<ptrdiff_t>(address) < LastChar - FirstChar; + return static_cast<std::ptrdiff_t>(address) < LastChar - FirstChar; } bool objectEnd(uint64_t address) const { - return static_cast<ptrdiff_t>(address) == LastChar - FirstChar; + return static_cast<std::ptrdiff_t>(address) == LastChar - FirstChar; } RawMemoryObject(const RawMemoryObject&) LLVM_DELETED_FUNCTION; |