diff options
| author | Rafael Espindola <rafael.espindola@gmail.com> | 2014-06-23 20:41:02 +0000 |
|---|---|---|
| committer | Rafael Espindola <rafael.espindola@gmail.com> | 2014-06-23 20:41:02 +0000 |
| commit | 2da970364f190876f204da5fdcf4eb9bce201255 (patch) | |
| tree | 143dc52bf65da7cdab4a7f936997c995674f8a81 /tools/llvm-nm | |
| parent | 0da818cdbb0a4b01e8d59f1050da8b4b2ea5624c (diff) | |
| download | llvm-2da970364f190876f204da5fdcf4eb9bce201255.tar.gz llvm-2da970364f190876f204da5fdcf4eb9bce201255.tar.bz2 llvm-2da970364f190876f204da5fdcf4eb9bce201255.tar.xz | |
Convert a few methods to use ErrorOr.
It used to be inconvenient to mix ErrorOr and UniquePtr, but with c++11
they work OK together.
git-svn-id: https://llvm.org/svn/llvm-project/llvm/trunk@211532 91177308-0d34-0410-b5e6-96231b3b80d8
Diffstat (limited to 'tools/llvm-nm')
| -rw-r--r-- | tools/llvm-nm/llvm-nm.cpp | 5 |
1 files changed, 3 insertions, 2 deletions
diff --git a/tools/llvm-nm/llvm-nm.cpp b/tools/llvm-nm/llvm-nm.cpp index f706bcdc2b..aeb7ba1072 100644 --- a/tools/llvm-nm/llvm-nm.cpp +++ b/tools/llvm-nm/llvm-nm.cpp @@ -773,9 +773,10 @@ static void dumpSymbolNamesFromFile(std::string &Filename) { for (MachOUniversalBinary::object_iterator I = UB->begin_objects(), E = UB->end_objects(); I != E; ++I) { - std::unique_ptr<ObjectFile> Obj; + ErrorOr<std::unique_ptr<ObjectFile>> ObjOrErr = I->getAsObjectFile(); std::unique_ptr<Archive> A; - if (!I->getAsObjectFile(Obj)) { + if (ObjOrErr) { + std::unique_ptr<ObjectFile> Obj = std::move(ObjOrErr.get()); if (moreThanOneArch) outs() << "\n"; outs() << Obj->getFileName(); |