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 /include/llvm | |
| 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 'include/llvm')
| -rw-r--r-- | include/llvm/Object/MachOUniversal.h | 6 |
1 files changed, 3 insertions, 3 deletions
diff --git a/include/llvm/Object/MachOUniversal.h b/include/llvm/Object/MachOUniversal.h index 74448f973b..94fe99deec 100644 --- a/include/llvm/Object/MachOUniversal.h +++ b/include/llvm/Object/MachOUniversal.h @@ -57,7 +57,7 @@ public: return Triple::getArchTypeName(MachOObjectFile::getArch(Header.cputype)); } - std::error_code getAsObjectFile(std::unique_ptr<ObjectFile> &Result) const; + ErrorOr<std::unique_ptr<ObjectFile>> getAsObjectFile() const; std::error_code getAsArchive(std::unique_ptr<Archive> &Result) const; }; @@ -100,8 +100,8 @@ public: return V->isMachOUniversalBinary(); } - std::error_code getObjectForArch(Triple::ArchType Arch, - std::unique_ptr<ObjectFile> &Result) const; + ErrorOr<std::unique_ptr<ObjectFile>> + getObjectForArch(Triple::ArchType Arch) const; }; } |