6502/llvm-6502
1
0
Fork 0
mirror of https://github.com/c64scene-ar/llvm-6502.git synced 2025-08-09 11:25:55 +00:00
Code Issues Projects Releases Wiki Activity

unique_ptrify MachOUniversalBinary::create

Browse Source 
git-svn-id: https://llvm.org/svn/llvm-project/llvm/trunk@217052 91177308-0d34-0410-b5e6-96231b3b80d8
This commit is contained in:
David Blaikie
2014-09-03 17:41:05 +00:00
parent b89304eb7c
commit 413eadfac9
3 changed files with 5 additions and 5 deletions
Download Patch File Download Diff File Expand all files Collapse all files

3
include/llvm/Object/MachOUniversal.h
View File

@@ -85,7 +85,8 @@ public:
}; };
MachOUniversalBinary(MemoryBufferRef Souce, std::error_code &EC); 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 { object_iterator begin_objects() const {
return ObjectForArch(this, 0); return ObjectForArch(this, 0);

3
lib/Object/Binary.cpp
View File

@@ -63,8 +63,7 @@ ErrorOr<std::unique_ptr<Binary>> object::createBinary(MemoryBufferRef Buffer,
case sys::fs::file_magic::bitcode: case sys::fs::file_magic::bitcode:
return ObjectFile::createSymbolicFile(Buffer, Type, Context); return ObjectFile::createSymbolicFile(Buffer, Type, Context);
case sys::fs::file_magic::macho_universal_binary: case sys::fs::file_magic::macho_universal_binary:
return ErrorOr<std::unique_ptr<Binary>>( return MachOUniversalBinary::create(Buffer);
MachOUniversalBinary::create(Buffer));
case sys::fs::file_magic::unknown: case sys::fs::file_magic::unknown:
case sys::fs::file_magic::windows_resource: case sys::fs::file_magic::windows_resource:
// Unrecognized object file format. // Unrecognized object file format.

4
lib/Object/MachOUniversal.cpp
View File

@@ -97,14 +97,14 @@ std::error_code MachOUniversalBinary::ObjectForArch::getAsArchive(
void MachOUniversalBinary::anchor() { } void MachOUniversalBinary::anchor() { }
ErrorOr<MachOUniversalBinary *> ErrorOr<std::unique_ptr<MachOUniversalBinary>>
MachOUniversalBinary::create(MemoryBufferRef Source) { MachOUniversalBinary::create(MemoryBufferRef Source) {
std::error_code EC; std::error_code EC;
std::unique_ptr<MachOUniversalBinary> Ret( std::unique_ptr<MachOUniversalBinary> Ret(
new MachOUniversalBinary(Source, EC)); new MachOUniversalBinary(Source, EC));
if (EC) if (EC)
return EC; return EC;
return Ret.release(); return std::move(Ret);
} }
MachOUniversalBinary::MachOUniversalBinary(MemoryBufferRef Source, MachOUniversalBinary::MachOUniversalBinary(MemoryBufferRef Source,