Update the MemoryBuffer API to use ErrorOr.

llvm-svn: 212405
2014-07-06 17:43:13 +00:00
parent 178cadafc1
commit adf21f2a56
35 changed files with 296 additions and 279 deletions
--- a/llvm/lib/Object/ObjectFile.cpp
+++ b/llvm/lib/Object/ObjectFile.cpp
@@ -83,8 +83,9 @@ ObjectFile::createObjectFile(std::unique_ptr<MemoryBuffer> &Object,
 }

 ErrorOr<ObjectFile *> ObjectFile::createObjectFile(StringRef ObjectPath) {
-  std::unique_ptr<MemoryBuffer> File;
-  if (std::error_code EC = MemoryBuffer::getFile(ObjectPath, File))
+  ErrorOr<std::unique_ptr<MemoryBuffer>> FileOrErr =
+      MemoryBuffer::getFile(ObjectPath);
+  if (std::error_code EC = FileOrErr.getError())
    return EC;
-  return createObjectFile(File);
+  return createObjectFile(FileOrErr.get());
 }