diff options
| author | Rafael Espindola <rafael.espindola@gmail.com> | 2014-07-06 17:43:24 +0000 |
|---|---|---|
| committer | Rafael Espindola <rafael.espindola@gmail.com> | 2014-07-06 17:43:24 +0000 |
| commit | 2d2b420ab9452afe2b298418ceeb40096e72d935 (patch) | |
| tree | c977ec0bcf859f214acc265f1b1e7052f3d6ddfe /clang/lib/ARCMigrate/FileRemapper.cpp | |
| parent | c2199ecf1e833dc4b5e269141ecc72d3deb11616 (diff) | |
| download | bcm5719-llvm-2d2b420ab9452afe2b298418ceeb40096e72d935.tar.gz bcm5719-llvm-2d2b420ab9452afe2b298418ceeb40096e72d935.zip | |
Update for llvm api change.
llvm-svn: 212408
Diffstat (limited to 'clang/lib/ARCMigrate/FileRemapper.cpp')
| -rw-r--r-- | clang/lib/ARCMigrate/FileRemapper.cpp | 7 |
1 files changed, 4 insertions, 3 deletions
diff --git a/clang/lib/ARCMigrate/FileRemapper.cpp b/clang/lib/ARCMigrate/FileRemapper.cpp index aa249f916e0..40e60609006 100644 --- a/clang/lib/ARCMigrate/FileRemapper.cpp +++ b/clang/lib/ARCMigrate/FileRemapper.cpp @@ -65,12 +65,13 @@ bool FileRemapper::initFromFile(StringRef filePath, DiagnosticsEngine &Diag, std::vector<std::pair<const FileEntry *, const FileEntry *> > pairs; - std::unique_ptr<llvm::MemoryBuffer> fileBuf; - if (llvm::MemoryBuffer::getFile(infoFile.c_str(), fileBuf)) + llvm::ErrorOr<std::unique_ptr<llvm::MemoryBuffer>> fileBuf = + llvm::MemoryBuffer::getFile(infoFile.c_str()); + if (!fileBuf) return report("Error opening file: " + infoFile, Diag); SmallVector<StringRef, 64> lines; - fileBuf->getBuffer().split(lines, "\n"); + fileBuf.get()->getBuffer().split(lines, "\n"); for (unsigned idx = 0; idx+3 <= lines.size(); idx += 3) { StringRef fromFilename = lines[idx]; |
