From 1fca78a9b1d78ac2e05174e8b8b0eda5fe4ab8b3 Mon Sep 17 00:00:00 2001 From: Rafael Espindola Date: Wed, 15 Jan 2014 19:37:43 +0000 Subject: Return an ErrorOr from createBinary. I did write a version returning ErrorOr >, but it is too cumbersome to use without std::move. I will keep the patch locally and submit when we switch to c++11. git-svn-id: https://llvm.org/svn/llvm-project/llvm/trunk@199326 91177308-0d34-0410-b5e6-96231b3b80d8 --- tools/llvm-readobj/llvm-readobj.cpp | 5 +++-- 1 file changed, 3 insertions(+), 2 deletions(-) (limited to 'tools/llvm-readobj') diff --git a/tools/llvm-readobj/llvm-readobj.cpp b/tools/llvm-readobj/llvm-readobj.cpp index 2d9f3e50ce..916c658ddd 100644 --- a/tools/llvm-readobj/llvm-readobj.cpp +++ b/tools/llvm-readobj/llvm-readobj.cpp @@ -260,11 +260,12 @@ static void dumpInput(StringRef File) { } // Attempt to open the binary. - OwningPtr Binary; - if (error_code EC = createBinary(File, Binary)) { + ErrorOr BinaryOrErr = createBinary(File); + if (error_code EC = BinaryOrErr.getError()) { reportError(File, EC); return; } + OwningPtr Binary(BinaryOrErr.get()); if (Archive *Arc = dyn_cast(Binary.get())) dumpArchive(Arc); -- cgit v1.2.3