NVPTX: Use RAUW instead of reinventing the wheel

[oota-llvm.git] / lib / Object / MachOUniversal.cpp

diff --git a/lib/Object/MachOUniversal.cpp b/lib/Object/MachOUniversal.cpp
index 4ba5d9686497fc81bd21b02e3f8e3971be93f169..ece652b4c095ea63b500fd47dfa91f4ed9e8868a 100644 (file)
--- a/lib/Object/MachOUniversal.cpp
+++ b/lib/Object/MachOUniversal.cpp
@@ -88,10 +88,11 @@ std::error_code MachOUniversalBinary::ObjectForArch::getAsArchive(
     std::string ObjectName = Parent->getFileName().str();
     std::unique_ptr<MemoryBuffer> ObjBuffer(
         MemoryBuffer::getMemBuffer(ObjectData, ObjectName, false));
-    ErrorOr<Archive *> Obj = Archive::create(std::move(ObjBuffer));
+    ErrorOr<std::unique_ptr<Archive>> Obj =
+        Archive::create(std::move(ObjBuffer));
     if (std::error_code EC = Obj.getError())
       return EC;
-    Result.reset(Obj.get());
+    Result = std::move(Obj.get());
     return object_error::success;
   }
   return object_error::parse_failed;