maxjhandsome
/
llvm-project
forked from OSchip/llvm-project
1
0
Fork 0
Code Issues Pull Requests Packages Releases Wiki Activity

Be more specific about return type of MachOUniversalBinary::getObjectForArch 

llvm-svn: 220230
This commit is contained in:
Alexey Samsonov 2014-10-20 20:30:57 +00:00
parent 0a7c9d5831
commit 798ff92c3c
2 changed files with 4 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -25,8 +25,6 @@
namespace llvm {
namespace object {
class ObjectFile;
class MachOUniversalBinary : public Binary {
virtual void anchor();
@ -58,7 +56,7 @@ public:
return T.getArchName();
}
ErrorOr<std::unique_ptr<ObjectFile>> getAsObjectFile() const;
ErrorOr<std::unique_ptr<MachOObjectFile>> getAsObjectFile() const;
std::error_code getAsArchive(std::unique_ptr<Archive> &Result) const;
};
@ -102,7 +100,7 @@ public:
return V->isMachOUniversalBinary();
}
ErrorOr<std::unique_ptr<ObjectFile>>
ErrorOr<std::unique_ptr<MachOObjectFile>>
getObjectForArch(Triple::ArchType Arch) const;
};

4
llvm/lib/Object/MachOUniversal.cpp
View File

@ -67,7 +67,7 @@ MachOUniversalBinary::ObjectForArch::ObjectForArch(
}
}
ErrorOr<std::unique_ptr<ObjectFile>>
ErrorOr<std::unique_ptr<MachOObjectFile>>
MachOUniversalBinary::ObjectForArch::getAsObjectFile() const {
if (Parent) {
StringRef ParentData = Parent->getData();
@ -139,7 +139,7 @@ static bool getCTMForArch(Triple::ArchType Arch, MachO::CPUType &CTM) {
}
}
ErrorOr<std::unique_ptr<ObjectFile>>
ErrorOr<std::unique_ptr<MachOObjectFile>>
MachOUniversalBinary::getObjectForArch(Triple::ArchType Arch) const {
MachO::CPUType CTM;
if (!getCTMForArch(Arch, CTM))