diff options
| author | Timur Iskhodzhanov <timurrrr@google.com> | 2014-05-07 08:52:13 +0000 |
|---|---|---|
| committer | Timur Iskhodzhanov <timurrrr@google.com> | 2014-05-07 08:52:13 +0000 |
| commit | 2e5d6d3ce3f0b663f10ae2f32d83c0a48da4bed9 (patch) | |
| tree | d8ebc03aa96f1eb15a1768426af1731fc31a8623 /llvm/lib/IR/GCOV.cpp | |
| parent | 1ea6647838dc8582ae52624a9772aa424c0c7148 (diff) | |
| download | bcm5719-llvm-2e5d6d3ce3f0b663f10ae2f32d83c0a48da4bed9.tar.gz bcm5719-llvm-2e5d6d3ce3f0b663f10ae2f32d83c0a48da4bed9.zip | |
Work-around MSVS build breakage due to r208148
llvm-svn: 208171
Diffstat (limited to 'llvm/lib/IR/GCOV.cpp')
| -rw-r--r-- | llvm/lib/IR/GCOV.cpp | 6 |
1 files changed, 4 insertions, 2 deletions
diff --git a/llvm/lib/IR/GCOV.cpp b/llvm/lib/IR/GCOV.cpp index 7a89723d855..e8d26e0d9e1 100644 --- a/llvm/lib/IR/GCOV.cpp +++ b/llvm/lib/IR/GCOV.cpp @@ -514,8 +514,10 @@ FileInfo::openCoveragePath(StringRef CoveragePath) { return make_unique<raw_null_ostream>(); std::string ErrorInfo; - auto OS = make_unique<raw_fd_ostream>(CoveragePath.str().c_str(), ErrorInfo, - sys::fs::F_Text); + // FIXME: When using MSVS, we end up having both std::make_unique and + // llvm::make_unique which conflict. Explicitly use the llvm:: version. + auto OS = llvm::make_unique<raw_fd_ostream>(CoveragePath.str().c_str(), + ErrorInfo, sys::fs::F_Text); if (!ErrorInfo.empty()) { errs() << ErrorInfo << "\n"; return make_unique<raw_null_ostream>(); |
