summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorSimon Pilgrim <llvm-dev@redking.me.uk>2018-09-13 10:10:18 +0000
committerSimon Pilgrim <llvm-dev@redking.me.uk>2018-09-13 10:10:18 +0000
commit4588fc80bf0a20b0d7d3d75cb4f18871529d3ba5 (patch)
treeb3d3ca002a39f964e44810ad682dfa7c176db2ca
parentd9f33b129ccff18321bfa63e0f22972e48e7143f (diff)
downloadbcm5719-llvm-4588fc80bf0a20b0d7d3d75cb4f18871529d3ba5.tar.gz
bcm5719-llvm-4588fc80bf0a20b0d7d3d75cb4f18871529d3ba5.zip
Fix MSVC "illegal conversion; more than one user-defined conversion has been implicitly applied" warning. NFCI.
llvm-svn: 342125
-rw-r--r--clang/lib/Driver/Driver.cpp2
1 files changed, 1 insertions, 1 deletions
diff --git a/clang/lib/Driver/Driver.cpp b/clang/lib/Driver/Driver.cpp
index e84c7558e74..908ffa3bd10 100644
--- a/clang/lib/Driver/Driver.cpp
+++ b/clang/lib/Driver/Driver.cpp
@@ -4163,7 +4163,7 @@ std::string Driver::GetFilePath(StringRef Name, const ToolChain &TC) const {
SmallString<128> P(Dir[0] == '=' ? SysRoot + Dir.substr(1) : Dir);
llvm::sys::path::append(P, Name);
if (llvm::sys::fs::exists(Twine(P)))
- return {P.str()};
+ return P.str().str();
}
return None;
};
OpenPOWER on IntegriCloud