diff options
| author | Zachary Turner <zturner@google.com> | 2017-10-11 23:54:34 +0000 |
|---|---|---|
| committer | Zachary Turner <zturner@google.com> | 2017-10-11 23:54:34 +0000 |
| commit | 41a9ee98f9fb16d463667e28e56fb42c962e91ce (patch) | |
| tree | 3190cb8adff093b171c4393d18d4c136b8a1195b /clang/lib/Driver/ToolChains/MSVC.cpp | |
| parent | c18c12e3850b5a4354d19c67b89b42220b8ae4c8 (diff) | |
| download | bcm5719-llvm-41a9ee98f9fb16d463667e28e56fb42c962e91ce.tar.gz bcm5719-llvm-41a9ee98f9fb16d463667e28e56fb42c962e91ce.zip | |
Revert "[ADT] Make Twine's copy constructor private."
This reverts commit 4e4ee1c507e2707bb3c208e1e1b6551c3015cbf5.
This is failing due to some code that isn't built on MSVC
so I didn't catch. Not immediately obvious how to fix this
at first glance, so I'm reverting for now.
llvm-svn: 315536
Diffstat (limited to 'clang/lib/Driver/ToolChains/MSVC.cpp')
| -rw-r--r-- | clang/lib/Driver/ToolChains/MSVC.cpp | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/clang/lib/Driver/ToolChains/MSVC.cpp b/clang/lib/Driver/ToolChains/MSVC.cpp index b0e2a7605eb..ae41ee9e22c 100644 --- a/clang/lib/Driver/ToolChains/MSVC.cpp +++ b/clang/lib/Driver/ToolChains/MSVC.cpp @@ -369,7 +369,7 @@ void visualstudio::Linker::ConstructJob(Compilation &C, const JobAction &JA, SmallString<128> ImplibName(Output.getFilename()); llvm::sys::path::replace_extension(ImplibName, "lib"); - CmdArgs.push_back(Args.MakeArgString(Twine("-implib:") + ImplibName)); + CmdArgs.push_back(Args.MakeArgString(std::string("-implib:") + ImplibName)); } if (TC.getSanitizerArgs().needsAsanRt()) { |
