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/Lex/PTHLexer.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/Lex/PTHLexer.cpp')
| -rw-r--r-- | clang/lib/Lex/PTHLexer.cpp | 6 |
1 files changed, 4 insertions, 2 deletions
diff --git a/clang/lib/Lex/PTHLexer.cpp b/clang/lib/Lex/PTHLexer.cpp index 844d66a8a1c..d985abac6b3 100644 --- a/clang/lib/Lex/PTHLexer.cpp +++ b/clang/lib/Lex/PTHLexer.cpp @@ -440,13 +440,15 @@ static void InvalidPTH(DiagnosticsEngine &Diags, const char *Msg) { PTHManager *PTHManager::Create(const std::string &file, DiagnosticsEngine &Diags) { // Memory map the PTH file. - std::unique_ptr<llvm::MemoryBuffer> File; + llvm::ErrorOr<std::unique_ptr<llvm::MemoryBuffer>> FileOrErr = + llvm::MemoryBuffer::getFile(file); - if (llvm::MemoryBuffer::getFile(file, File)) { + if (!FileOrErr) { // FIXME: Add ec.message() to this diag. Diags.Report(diag::err_invalid_pth_file) << file; return nullptr; } + std::unique_ptr<llvm::MemoryBuffer> File = std::move(FileOrErr.get()); using namespace llvm::support; |
