Author: rksimon Date: Thu Sep 13 03:10:18 2018 New Revision: 342125 URL: http://llvm.org/viewvc/llvm-project?rev=342125&view=rev Log: Fix MSVC "illegal conversion; more than one user-defined conversion has been implicitly applied" warning. NFCI.
Modified: cfe/trunk/lib/Driver/Driver.cpp Modified: cfe/trunk/lib/Driver/Driver.cpp URL: http://llvm.org/viewvc/llvm-project/cfe/trunk/lib/Driver/Driver.cpp?rev=342125&r1=342124&r2=342125&view=diff ============================================================================== --- cfe/trunk/lib/Driver/Driver.cpp (original) +++ cfe/trunk/lib/Driver/Driver.cpp Thu Sep 13 03:10:18 2018 @@ -4163,7 +4163,7 @@ std::string Driver::GetFilePath(StringRe 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; }; _______________________________________________ cfe-commits mailing list cfe-commits@lists.llvm.org http://lists.llvm.org/cgi-bin/mailman/listinfo/cfe-commits