Pass a unique_ptr<MemoryBuffer> to the constructors in the Binary hierarchy.

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

diff --git a/lib/Object/ELFObjectFile.cpp b/lib/Object/ELFObjectFile.cpp
index a9165af79d6493678d57e744d1f2b9078cad072f..7095caf1a6ee3bb62c8ac9fbc25424b464bbb5b9 100644 (file)
--- a/lib/Object/ELFObjectFile.cpp
+++ b/lib/Object/ELFObjectFile.cpp
@@ -34,7 +34,7 @@ ObjectFile::createELFObjectFile(std::unique_ptr<MemoryBuffer> &Obj) {
 #endif
     if (MaxAlignment >= 2)
       R.reset(new ELFObjectFile<ELFType<support::little, 2, false>>(
-          Obj.release(), EC));
+          std::move(Obj), EC));
     else
       return object_error::parse_failed;
   else if (Ident.first == ELF::ELFCLASS32 && Ident.second == ELF::ELFDATA2MSB)
@@ -45,32 +45,32 @@ ObjectFile::createELFObjectFile(std::unique_ptr<MemoryBuffer> &Obj) {
     else
 #endif
     if (MaxAlignment >= 2)
-      R.reset(new ELFObjectFile<ELFType<support::big, 2, false>>(Obj.release(),
+      R.reset(new ELFObjectFile<ELFType<support::big, 2, false>>(std::move(Obj),
                                                                  EC));
     else
       return object_error::parse_failed;
   else if (Ident.first == ELF::ELFCLASS64 && Ident.second == ELF::ELFDATA2MSB)
 #if !LLVM_IS_UNALIGNED_ACCESS_FAST
     if (MaxAlignment >= 8)
-      R.reset(
-          new ELFObjectFile<ELFType<support::big, 8, true>>(Obj.release(), EC));
+      R.reset(new ELFObjectFile<ELFType<support::big, 8, true>>(std::move(Obj),
+                                                                EC));
     else
 #endif
     if (MaxAlignment >= 2)
-      R.reset(
-          new ELFObjectFile<ELFType<support::big, 2, true>>(Obj.release(), EC));
+      R.reset(new ELFObjectFile<ELFType<support::big, 2, true>>(std::move(Obj),
+                                                                EC));
     else
       return object_error::parse_failed;
   else if (Ident.first == ELF::ELFCLASS64 && Ident.second == ELF::ELFDATA2LSB) {
 #if !LLVM_IS_UNALIGNED_ACCESS_FAST
     if (MaxAlignment >= 8)
       R.reset(new ELFObjectFile<ELFType<support::little, 8, true>>(
-          Obj.release(), EC));
+          std::move(Obj), EC));
     else
 #endif
     if (MaxAlignment >= 2)
       R.reset(new ELFObjectFile<ELFType<support::little, 2, true>>(
-          Obj.release(), EC));
+          std::move(Obj), EC));
     else
       return object_error::parse_failed;
   }