From 2da970364f190876f204da5fdcf4eb9bce201255 Mon Sep 17 00:00:00 2001 From: Rafael Espindola Date: Mon, 23 Jun 2014 20:41:02 +0000 Subject: 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 --- include/llvm/Object/MachOUniversal.h | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) (limited to 'include/llvm') 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 &Result) const; + ErrorOr> getAsObjectFile() const; std::error_code getAsArchive(std::unique_ptr &Result) const; }; @@ -100,8 +100,8 @@ public: return V->isMachOUniversalBinary(); } - std::error_code getObjectForArch(Triple::ArchType Arch, - std::unique_ptr &Result) const; + ErrorOr> + getObjectForArch(Triple::ArchType Arch) const; }; } -- cgit v1.2.3