From 3cb7bf59521affd2160f21433c24cfa32ec2f1ca Mon Sep 17 00:00:00 2001 From: Vedant Kumar Date: Wed, 29 Jun 2016 00:37:13 +0000 Subject: [PATCH] [Object] Fix a -Wpessimizing-move error; clang-format; NFC git-svn-id: https://llvm.org/svn/llvm-project/llvm/trunk@274085 91177308-0d34-0410-b5e6-96231b3b80d8 --- lib/Object/MachOUniversal.cpp | 13 ++++++++----- 1 file changed, 8 insertions(+), 5 deletions(-) diff --git a/lib/Object/MachOUniversal.cpp b/lib/Object/MachOUniversal.cpp index 5c8501010c4..8f5d56b90cb 100644 --- a/lib/Object/MachOUniversal.cpp +++ b/lib/Object/MachOUniversal.cpp @@ -123,7 +123,8 @@ MachOUniversalBinary::MachOUniversalBinary(MemoryBufferRef Source, Error &Err) } // Check for magic value and sufficient header size. StringRef Buf = getData(); - MachO::fat_header H= getUniversalBinaryStruct(Buf.begin()); + MachO::fat_header H = + getUniversalBinaryStruct(Buf.begin()); Magic = H.magic; NumberOfObjects = H.nfat_arch; uint32_t MinSize = sizeof(MachO::fat_header); @@ -147,15 +148,17 @@ MachOUniversalBinary::MachOUniversalBinary(MemoryBufferRef Source, Error &Err) Expected> MachOUniversalBinary::getObjectForArch(StringRef ArchName) const { if (Triple(ArchName).getArch() == Triple::ArchType::UnknownArch) - return make_error(std::move("Unknown architecture " - "named: " + ArchName), + return make_error("Unknown architecture " + "named: " + + ArchName, object_error::arch_not_found); for (object_iterator I = begin_objects(), E = end_objects(); I != E; ++I) { if (I->getArchTypeName() == ArchName) return I->getAsObjectFile(); } - return make_error(std::move("fat file does not " - "contain " + ArchName), + return make_error("fat file does not " + "contain " + + ArchName, object_error::arch_not_found); } -- 2.50.0