diff options
author | Craig Topper <craig.topper@gmail.com> | 2014-05-18 21:55:38 +0000 |
---|---|---|
committer | Craig Topper <craig.topper@gmail.com> | 2014-05-18 21:55:38 +0000 |
commit | 6ec950549b013843a5348cc4fa5684ef10a86e7e (patch) | |
tree | 025ac3e1f525fd70a948a3d7daf20e3c4241f324 /lib | |
parent | 677564fe722595d204f2b530db8706ac1037b2b4 (diff) | |
download | llvm-6ec950549b013843a5348cc4fa5684ef10a86e7e.tar.gz llvm-6ec950549b013843a5348cc4fa5684ef10a86e7e.tar.bz2 llvm-6ec950549b013843a5348cc4fa5684ef10a86e7e.tar.xz |
Remove last uses of OwningPtr from llvm. As far as I can tell these method versions are not used by lldb, lld, or clang.
git-svn-id: https://llvm.org/svn/llvm-project/llvm/trunk@209103 91177308-0d34-0410-b5e6-96231b3b80d8
Diffstat (limited to 'lib')
-rw-r--r-- | lib/Object/Archive.cpp | 17 | ||||
-rw-r--r-- | lib/Support/FileOutputBuffer.cpp | 11 | ||||
-rw-r--r-- | lib/Support/MemoryBuffer.cpp | 52 |
3 files changed, 0 insertions, 80 deletions
diff --git a/lib/Object/Archive.cpp b/lib/Object/Archive.cpp index d53704fa79..304ca475e1 100644 --- a/lib/Object/Archive.cpp +++ b/lib/Object/Archive.cpp @@ -13,7 +13,6 @@ #include "llvm/Object/Archive.h" #include "llvm/ADT/APInt.h" -#include "llvm/ADT/OwningPtr.h" #include "llvm/ADT/SmallString.h" #include "llvm/ADT/Twine.h" #include "llvm/Support/Endian.h" @@ -183,14 +182,6 @@ error_code Archive::Child::getMemoryBuffer(std::unique_ptr<MemoryBuffer> &Result return error_code::success(); } -error_code Archive::Child::getMemoryBuffer(OwningPtr<MemoryBuffer> &Result, - bool FullPath) const { - std::unique_ptr<MemoryBuffer> MB; - error_code ec = getMemoryBuffer(MB, FullPath); - Result = std::move(MB); - return ec; -} - error_code Archive::Child::getAsBinary(std::unique_ptr<Binary> &Result, LLVMContext *Context) const { std::unique_ptr<Binary> ret; @@ -204,14 +195,6 @@ error_code Archive::Child::getAsBinary(std::unique_ptr<Binary> &Result, return object_error::success; } -error_code Archive::Child::getAsBinary(OwningPtr<Binary> &Result, - LLVMContext *Context) const { - std::unique_ptr<Binary> B; - error_code ec = getAsBinary(B, Context); - Result = std::move(B); - return ec; -} - ErrorOr<Archive*> Archive::create(MemoryBuffer *Source) { error_code EC; std::unique_ptr<Archive> Ret(new Archive(Source, EC)); diff --git a/lib/Support/FileOutputBuffer.cpp b/lib/Support/FileOutputBuffer.cpp index 7e922df135..49311c29d8 100644 --- a/lib/Support/FileOutputBuffer.cpp +++ b/lib/Support/FileOutputBuffer.cpp @@ -12,7 +12,6 @@ //===----------------------------------------------------------------------===// #include "llvm/Support/FileOutputBuffer.h" -#include "llvm/ADT/OwningPtr.h" #include "llvm/ADT/SmallVector.h" #include "llvm/Support/raw_ostream.h" #include "llvm/Support/system_error.h" @@ -85,16 +84,6 @@ error_code FileOutputBuffer::create(StringRef FilePath, return error_code::success(); } -error_code FileOutputBuffer::create(StringRef FilePath, - size_t Size, - OwningPtr<FileOutputBuffer> &Result, - unsigned Flags) { - std::unique_ptr<FileOutputBuffer> FOB; - error_code ec = create(FilePath, Size, FOB, Flags); - Result = std::move(FOB); - return ec; -} - error_code FileOutputBuffer::commit(int64_t NewSmallerSize) { // Unmap buffer, letting OS flush dirty pages to file on disk. Region.reset(nullptr); diff --git a/lib/Support/MemoryBuffer.cpp b/lib/Support/MemoryBuffer.cpp index 26c3a2ebd2..9be05d6b7a 100644 --- a/lib/Support/MemoryBuffer.cpp +++ b/lib/Support/MemoryBuffer.cpp @@ -12,7 +12,6 @@ //===----------------------------------------------------------------------===// #include "llvm/Support/MemoryBuffer.h" -#include "llvm/ADT/OwningPtr.h" #include "llvm/ADT/SmallString.h" #include "llvm/Config/config.h" #include "llvm/Support/Errno.h" @@ -165,15 +164,6 @@ error_code MemoryBuffer::getFileOrSTDIN(StringRef Filename, return getFile(Filename, Result, FileSize); } -error_code MemoryBuffer::getFileOrSTDIN(StringRef Filename, - OwningPtr<MemoryBuffer> &Result, - int64_t FileSize) { - std::unique_ptr<MemoryBuffer> MB; - error_code ec = getFileOrSTDIN(Filename, MB, FileSize); - Result = std::move(MB); - return ec; -} - //===----------------------------------------------------------------------===// // MemoryBuffer::getFile implementation. @@ -259,18 +249,6 @@ error_code MemoryBuffer::getFile(Twine Filename, RequiresNullTerminator, IsVolatileSize); } -error_code MemoryBuffer::getFile(Twine Filename, - OwningPtr<MemoryBuffer> &Result, - int64_t FileSize, - bool RequiresNullTerminator, - bool IsVolatileSize) { - std::unique_ptr<MemoryBuffer> MB; - error_code ec = getFile(Filename, MB, FileSize, RequiresNullTerminator, - IsVolatileSize); - Result = std::move(MB); - return ec; -} - static error_code getOpenFileImpl(int FD, const char *Filename, std::unique_ptr<MemoryBuffer> &Result, uint64_t FileSize, uint64_t MapSize, @@ -437,18 +415,6 @@ error_code MemoryBuffer::getOpenFile(int FD, const char *Filename, RequiresNullTerminator, IsVolatileSize); } -error_code MemoryBuffer::getOpenFile(int FD, const char *Filename, - OwningPtr<MemoryBuffer> &Result, - uint64_t FileSize, - bool RequiresNullTerminator, - bool IsVolatileSize) { - std::unique_ptr<MemoryBuffer> MB; - error_code ec = getOpenFileImpl(FD, Filename, MB, FileSize, FileSize, 0, - RequiresNullTerminator, IsVolatileSize); - Result = std::move(MB); - return ec; -} - error_code MemoryBuffer::getOpenFileSlice(int FD, const char *Filename, std::unique_ptr<MemoryBuffer> &Result, uint64_t MapSize, int64_t Offset, @@ -457,17 +423,6 @@ error_code MemoryBuffer::getOpenFileSlice(int FD, const char *Filename, IsVolatileSize); } -error_code MemoryBuffer::getOpenFileSlice(int FD, const char *Filename, - OwningPtr<MemoryBuffer> &Result, - uint64_t MapSize, int64_t Offset, - bool IsVolatileSize) { - std::unique_ptr<MemoryBuffer> MB; - error_code ec = getOpenFileImpl(FD, Filename, MB, -1, MapSize, Offset, false, - IsVolatileSize); - Result = std::move(MB); - return ec; -} - //===----------------------------------------------------------------------===// // MemoryBuffer::getSTDIN implementation. //===----------------------------------------------------------------------===// @@ -481,10 +436,3 @@ error_code MemoryBuffer::getSTDIN(std::unique_ptr<MemoryBuffer> &Result) { return getMemoryBufferForStream(0, "<stdin>", Result); } - -error_code MemoryBuffer::getSTDIN(OwningPtr<MemoryBuffer> &Result) { - std::unique_ptr<MemoryBuffer> MB; - error_code ec = getSTDIN(MB); - Result = std::move(MB); - return ec; -} |