summaryrefslogtreecommitdiffstats
path: root/lld/unittests/MachOTests/MachONormalizedFileBinaryWriterTests.cpp
diff options
context:
space:
mode:
authorAhmed Charles <ahmedcharles@gmail.com>2014-03-13 16:20:38 +0000
committerAhmed Charles <ahmedcharles@gmail.com>2014-03-13 16:20:38 +0000
commit13c70b6d4bc0103ee0eca170d44bdb183328a5b5 (patch)
tree7cf82b2fcb802d76e3e5acfc83709e7b8299166c /lld/unittests/MachOTests/MachONormalizedFileBinaryWriterTests.cpp
parent445a939db82713007c9b532144a405f05a587c52 (diff)
downloadbcm5719-llvm-13c70b6d4bc0103ee0eca170d44bdb183328a5b5.tar.gz
bcm5719-llvm-13c70b6d4bc0103ee0eca170d44bdb183328a5b5.zip
Replace OwningPtr with std::unique_ptr.
This results in some simplifications to the code where an OwningPtr had to be used with the previous api and then ownership moved to a unique_ptr for the rest of lld. llvm-svn: 203809
Diffstat (limited to 'lld/unittests/MachOTests/MachONormalizedFileBinaryWriterTests.cpp')
-rw-r--r--lld/unittests/MachOTests/MachONormalizedFileBinaryWriterTests.cpp7
1 files changed, 2 insertions, 5 deletions
diff --git a/lld/unittests/MachOTests/MachONormalizedFileBinaryWriterTests.cpp b/lld/unittests/MachOTests/MachONormalizedFileBinaryWriterTests.cpp
index 6c8b6d4013a..36869c0ae56 100644
--- a/lld/unittests/MachOTests/MachONormalizedFileBinaryWriterTests.cpp
+++ b/lld/unittests/MachOTests/MachONormalizedFileBinaryWriterTests.cpp
@@ -10,18 +10,17 @@
#include "gtest/gtest.h"
#include "../../lib/ReaderWriter/MachO/MachONormalizedFile.h"
-#include <llvm/ADT/OwningPtr.h>
#include <llvm/ADT/Twine.h>
#include <llvm/Support/FileSystem.h>
#include <llvm/Support/MachO.h>
#include <llvm/Support/system_error.h>
#include <cassert>
+#include <memory>
#include <vector>
using llvm::StringRef;
using llvm::MemoryBuffer;
-using llvm::OwningPtr;
using llvm::SmallString;
using llvm::Twine;
using llvm::ErrorOr;
@@ -34,10 +33,8 @@ using namespace lld::mach_o::normalized;
// Normalized file to nf parameter.
static void fromBinary(StringRef path, std::unique_ptr<MemoryBuffer> &mb,
std::unique_ptr<NormalizedFile> &nf, StringRef archStr) {
- OwningPtr<MemoryBuffer> opmb;
- error_code ec = MemoryBuffer::getFile(path, opmb);
+ error_code ec = MemoryBuffer::getFile(path, mb);
EXPECT_FALSE(ec);
- mb.reset(opmb.take());
ErrorOr<std::unique_ptr<NormalizedFile>> r =
lld::mach_o::normalized::readBinary(
OpenPOWER on IntegriCloud