diff options
| -rw-r--r-- | llvm/include/llvm/Object/MachOUniversal.h | 3 | ||||
| -rw-r--r-- | llvm/lib/Object/Binary.cpp | 3 | ||||
| -rw-r--r-- | llvm/lib/Object/MachOUniversal.cpp | 4 |
3 files changed, 5 insertions, 5 deletions
diff --git a/llvm/include/llvm/Object/MachOUniversal.h b/llvm/include/llvm/Object/MachOUniversal.h index 491565ba8e5..949010be44e 100644 --- a/llvm/include/llvm/Object/MachOUniversal.h +++ b/llvm/include/llvm/Object/MachOUniversal.h @@ -85,7 +85,8 @@ public: }; MachOUniversalBinary(MemoryBufferRef Souce, std::error_code &EC); - static ErrorOr<MachOUniversalBinary *> create(MemoryBufferRef Source); + static ErrorOr<std::unique_ptr<MachOUniversalBinary>> + create(MemoryBufferRef Source); object_iterator begin_objects() const { return ObjectForArch(this, 0); diff --git a/llvm/lib/Object/Binary.cpp b/llvm/lib/Object/Binary.cpp index d9fef8be8e1..d23ee590569 100644 --- a/llvm/lib/Object/Binary.cpp +++ b/llvm/lib/Object/Binary.cpp @@ -63,8 +63,7 @@ ErrorOr<std::unique_ptr<Binary>> object::createBinary(MemoryBufferRef Buffer, case sys::fs::file_magic::bitcode: return ObjectFile::createSymbolicFile(Buffer, Type, Context); case sys::fs::file_magic::macho_universal_binary: - return ErrorOr<std::unique_ptr<Binary>>( - MachOUniversalBinary::create(Buffer)); + return MachOUniversalBinary::create(Buffer); case sys::fs::file_magic::unknown: case sys::fs::file_magic::windows_resource: // Unrecognized object file format. diff --git a/llvm/lib/Object/MachOUniversal.cpp b/llvm/lib/Object/MachOUniversal.cpp index 3deef4b7f65..e310a71ba91 100644 --- a/llvm/lib/Object/MachOUniversal.cpp +++ b/llvm/lib/Object/MachOUniversal.cpp @@ -97,14 +97,14 @@ std::error_code MachOUniversalBinary::ObjectForArch::getAsArchive( void MachOUniversalBinary::anchor() { } -ErrorOr<MachOUniversalBinary *> +ErrorOr<std::unique_ptr<MachOUniversalBinary>> MachOUniversalBinary::create(MemoryBufferRef Source) { std::error_code EC; std::unique_ptr<MachOUniversalBinary> Ret( new MachOUniversalBinary(Source, EC)); if (EC) return EC; - return Ret.release(); + return std::move(Ret); } MachOUniversalBinary::MachOUniversalBinary(MemoryBufferRef Source, |
