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 | 88ab50c23791442f13c72e331f0505f9fbb5046a (patch) | |
| tree | b027afd20a77a4830fd5abbb0c42a6dca79482ca /lib/IR/GCOV.cpp | |
| parent | 227c4c6185f6facd691bfa0c49c5fc8cf6d0569d (diff) | |
| download | llvm-88ab50c23791442f13c72e331f0505f9fbb5046a.tar.gz llvm-88ab50c23791442f13c72e331f0505f9fbb5046a.tar.bz2 llvm-88ab50c23791442f13c72e331f0505f9fbb5046a.tar.xz | |
Work-around MSVS build breakage due to r208148
git-svn-id: https://llvm.org/svn/llvm-project/llvm/trunk@208171 91177308-0d34-0410-b5e6-96231b3b80d8
Diffstat (limited to 'lib/IR/GCOV.cpp')
| -rw-r--r-- | lib/IR/GCOV.cpp | 6 |
1 files changed, 4 insertions, 2 deletions
diff --git a/lib/IR/GCOV.cpp b/lib/IR/GCOV.cpp index 7a89723d85..e8d26e0d9e 100644 --- a/lib/IR/GCOV.cpp +++ b/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>(); |