]> granicus.if.org Git - clang/commitdiff
Fix MSVC "illegal conversion; more than one user-defined conversion has been implicit...
authorSimon Pilgrim <llvm-dev@redking.me.uk>
Thu, 13 Sep 2018 10:10:18 +0000 (10:10 +0000)
committerSimon Pilgrim <llvm-dev@redking.me.uk>
Thu, 13 Sep 2018 10:10:18 +0000 (10:10 +0000)
git-svn-id: https://llvm.org/svn/llvm-project/cfe/trunk@342125 91177308-0d34-0410-b5e6-96231b3b80d8

lib/Driver/Driver.cpp

index e84c7558e7486b2314a681d6c9f3b1af262cf993..908ffa3bd1085dadd43b85518dd823617a9da602 100644 (file)
@@ -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;
   };