From 4b0e1f127841590d61783cda21babbdd79e49fae Mon Sep 17 00:00:00 2001 From: Jakob Stoklund Olesen Date: Thu, 10 Mar 2011 18:01:43 +0000 Subject: Revert r127409 which broke all the Windows bots. git-svn-id: https://llvm.org/svn/llvm-project/llvm/trunk@127413 91177308-0d34-0410-b5e6-96231b3b80d8 --- include/llvm/Support/MemoryBuffer.h | 8 ++------ include/llvm/Support/PathV1.h | 5 ++--- 2 files changed, 4 insertions(+), 9 deletions(-) (limited to 'include') diff --git a/include/llvm/Support/MemoryBuffer.h b/include/llvm/Support/MemoryBuffer.h index a52dc11cff..b6243b7b10 100644 --- a/include/llvm/Support/MemoryBuffer.h +++ b/include/llvm/Support/MemoryBuffer.h @@ -40,8 +40,7 @@ class MemoryBuffer { MemoryBuffer &operator=(const MemoryBuffer &); // DO NOT IMPLEMENT protected: MemoryBuffer() {} - void init(const char *BufStart, const char *BufEnd, - bool RequiresNullTerminator); + void init(const char *BufStart, const char *BufEnd); public: virtual ~MemoryBuffer(); @@ -73,10 +72,7 @@ public: /// return a MemoryBuffer. static error_code getOpenFile(int FD, const char *Filename, OwningPtr &result, - size_t FileSize = -1, - size_t MapSize = -1, - off_t Offset = 0, - bool RequiresNullTerminator = true); + int64_t FileSize = -1); /// getMemBuffer - Open the specified memory range as a MemoryBuffer. Note /// that InputData must be null terminated. diff --git a/include/llvm/Support/PathV1.h b/include/llvm/Support/PathV1.h index 024bb39ced..d7753a3e71 100644 --- a/include/llvm/Support/PathV1.h +++ b/include/llvm/Support/PathV1.h @@ -608,15 +608,14 @@ namespace sys { /// /// This API is not intended for general use, clients should use /// MemoryBuffer::getFile instead. - static const char *MapInFilePages(int FD, size_t FileSize, - off_t Offset); + static const char *MapInFilePages(int FD, uint64_t FileSize); /// UnMapFilePages - Free pages mapped into the current process by /// MapInFilePages. /// /// This API is not intended for general use, clients should use /// MemoryBuffer::getFile instead. - static void UnMapFilePages(const char *Base, size_t FileSize); + static void UnMapFilePages(const char *Base, uint64_t FileSize); /// @} /// @name Data -- cgit v1.2.3