diff options
| author | bors <bors@rust-lang.org> | 2016-12-12 07:19:35 +0000 |
|---|---|---|
| committer | bors <bors@rust-lang.org> | 2016-12-12 07:19:35 +0000 |
| commit | 8d66181b5e35295deea24c389db5366d0776f7f8 (patch) | |
| tree | 38158b16c8658e7067d053197047f4b100476697 /src/rustllvm/ArchiveWrapper.cpp | |
| parent | 81fb6509c81953c215bba2164470a41787e43193 (diff) | |
| parent | 6222de3ce4fcb59aeb0516305767f0043cc88f1e (diff) | |
| download | rust-8d66181b5e35295deea24c389db5366d0776f7f8.tar.gz rust-8d66181b5e35295deea24c389db5366d0776f7f8.zip | |
Auto merge of #38296 - dylanmckay:llvm-4.0-errortype, r=alexcrichton
[LLVM 4.0] Explicitly call constructor of 'llvm::Error' The implicit constructor has been deleted. We should use Error::success() instead. The constructor in the LLVM headers mentions that "success" should be used instead of the deleted constructor for clarity.
Diffstat (limited to 'src/rustllvm/ArchiveWrapper.cpp')
| -rw-r--r-- | src/rustllvm/ArchiveWrapper.cpp | 2 |
1 files changed, 2 insertions, 0 deletions
diff --git a/src/rustllvm/ArchiveWrapper.cpp b/src/rustllvm/ArchiveWrapper.cpp index 5adb05d6089..c7f426fbfa3 100644 --- a/src/rustllvm/ArchiveWrapper.cpp +++ b/src/rustllvm/ArchiveWrapper.cpp @@ -37,6 +37,8 @@ struct RustArchiveIterator { Archive::child_iterator end; #if LLVM_VERSION_GE(3, 9) Error err; + + RustArchiveIterator() : err(Error::success()) { } #endif }; |
