diff options
| author | Jan-Erik Rediger <janerik@fnordig.de> | 2016-07-13 16:06:50 +0200 |
|---|---|---|
| committer | Jan-Erik Rediger <janerik@fnordig.de> | 2016-07-29 10:29:44 +0200 |
| commit | dbb4178f4effa2f7686aca70d5fdfa0eff94e692 (patch) | |
| tree | 53d0b04493a99e102d356e5eb6054f22d1754e2d /src/rustllvm/ArchiveWrapper.cpp | |
| parent | 8433f9bb337066d933f3ae7a975354a5d910c718 (diff) | |
| download | rust-dbb4178f4effa2f7686aca70d5fdfa0eff94e692.tar.gz rust-dbb4178f4effa2f7686aca70d5fdfa0eff94e692.zip | |
[LLVM-3.9] Update return type for Archive::create
Changed in https://github.com/rust-lang/llvm/commit/0b21d88fd31b4bfb6fdb7e2f1ed5f93639d5bd1c
Diffstat (limited to 'src/rustllvm/ArchiveWrapper.cpp')
| -rw-r--r-- | src/rustllvm/ArchiveWrapper.cpp | 8 |
1 files changed, 8 insertions, 0 deletions
diff --git a/src/rustllvm/ArchiveWrapper.cpp b/src/rustllvm/ArchiveWrapper.cpp index cdd11e8838c..514d25297ee 100644 --- a/src/rustllvm/ArchiveWrapper.cpp +++ b/src/rustllvm/ArchiveWrapper.cpp @@ -43,11 +43,19 @@ LLVMRustOpenArchive(char *path) { return nullptr; } +#if LLVM_VERSION_MINOR <= 8 ErrorOr<std::unique_ptr<Archive>> archive_or = +#else + Expected<std::unique_ptr<Archive>> archive_or = +#endif Archive::create(buf_or.get()->getMemBufferRef()); if (!archive_or) { +#if LLVM_VERSION_MINOR <= 8 LLVMRustSetLastError(archive_or.getError().message().c_str()); +#else + LLVMRustSetLastError(toString(archive_or.takeError()).c_str()); +#endif return nullptr; } |