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/Tooling/CompilationDatabase.cpp | |
parent | c18c12e3850b5a4354d19c67b89b42220b8ae4c8 (diff) | |
download | llvm-41a9ee98f9fb16d463667e28e56fb42c962e91ce.zip llvm-41a9ee98f9fb16d463667e28e56fb42c962e91ce.tar.gz llvm-41a9ee98f9fb16d463667e28e56fb42c962e91ce.tar.bz2 |
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/Tooling/CompilationDatabase.cpp')
-rw-r--r-- | clang/lib/Tooling/CompilationDatabase.cpp | 6 |
1 files changed, 3 insertions, 3 deletions
diff --git a/clang/lib/Tooling/CompilationDatabase.cpp b/clang/lib/Tooling/CompilationDatabase.cpp index 121e001..0e83557 100644 --- a/clang/lib/Tooling/CompilationDatabase.cpp +++ b/clang/lib/Tooling/CompilationDatabase.cpp @@ -289,7 +289,7 @@ std::unique_ptr<FixedCompilationDatabase> FixedCompilationDatabase::loadFromCommandLine(int &Argc, const char *const *Argv, std::string &ErrorMsg, - const Twine &Directory) { + Twine Directory) { ErrorMsg.clear(); if (Argc == 0) return nullptr; @@ -306,8 +306,8 @@ FixedCompilationDatabase::loadFromCommandLine(int &Argc, new FixedCompilationDatabase(Directory, StrippedArgs)); } -FixedCompilationDatabase::FixedCompilationDatabase( - const Twine &Directory, ArrayRef<std::string> CommandLine) { +FixedCompilationDatabase:: +FixedCompilationDatabase(Twine Directory, ArrayRef<std::string> CommandLine) { std::vector<std::string> ToolCommandLine(1, "clang-tool"); ToolCommandLine.insert(ToolCommandLine.end(), CommandLine.begin(), CommandLine.end()); |