forked from OSchip/llvm-project
Consistently make llvm::opt::ArgStringList usage explicit to try and appease MSVC 2015 buildbots. NFCI.
llvm-svn: 344398
This commit is contained in:
parent
9082c1c0c1
commit
0e50d4c47b
|
@ -29,9 +29,6 @@ class Action;
|
|||
class InputInfo;
|
||||
class Tool;
|
||||
|
||||
// Re-export this as clang::driver::ArgStringList.
|
||||
using ArgStringList = llvm::opt::ArgStringList;
|
||||
|
||||
struct CrashReportInfo {
|
||||
StringRef Filename;
|
||||
StringRef VFSPath;
|
||||
|
@ -135,7 +132,8 @@ public:
|
|||
class FallbackCommand : public Command {
|
||||
public:
|
||||
FallbackCommand(const Action &Source_, const Tool &Creator_,
|
||||
const char *Executable_, const ArgStringList &Arguments_,
|
||||
const char *Executable_,
|
||||
const llvm::opt::ArgStringList &Arguments_,
|
||||
ArrayRef<InputInfo> Inputs,
|
||||
std::unique_ptr<Command> Fallback_);
|
||||
|
||||
|
@ -153,7 +151,8 @@ private:
|
|||
class ForceSuccessCommand : public Command {
|
||||
public:
|
||||
ForceSuccessCommand(const Action &Source_, const Tool &Creator_,
|
||||
const char *Executable_, const ArgStringList &Arguments_,
|
||||
const char *Executable_,
|
||||
const llvm::opt::ArgStringList &Arguments_,
|
||||
ArrayRef<InputInfo> Inputs);
|
||||
|
||||
void Print(llvm::raw_ostream &OS, const char *Terminator, bool Quote,
|
||||
|
|
|
@ -35,7 +35,8 @@ using namespace clang;
|
|||
using namespace driver;
|
||||
|
||||
Command::Command(const Action &Source, const Tool &Creator,
|
||||
const char *Executable, const ArgStringList &Arguments,
|
||||
const char *Executable,
|
||||
const llvm::opt::ArgStringList &Arguments,
|
||||
ArrayRef<InputInfo> Inputs)
|
||||
: Source(Source), Creator(Creator), Executable(Executable),
|
||||
Arguments(Arguments) {
|
||||
|
@ -366,7 +367,7 @@ int Command::Execute(ArrayRef<llvm::Optional<StringRef>> Redirects,
|
|||
|
||||
FallbackCommand::FallbackCommand(const Action &Source_, const Tool &Creator_,
|
||||
const char *Executable_,
|
||||
const ArgStringList &Arguments_,
|
||||
const llvm::opt::ArgStringList &Arguments_,
|
||||
ArrayRef<InputInfo> Inputs,
|
||||
std::unique_ptr<Command> Fallback_)
|
||||
: Command(Source_, Creator_, Executable_, Arguments_, Inputs),
|
||||
|
@ -405,11 +406,9 @@ int FallbackCommand::Execute(ArrayRef<llvm::Optional<StringRef>> Redirects,
|
|||
return SecondaryStatus;
|
||||
}
|
||||
|
||||
ForceSuccessCommand::ForceSuccessCommand(const Action &Source_,
|
||||
const Tool &Creator_,
|
||||
const char *Executable_,
|
||||
const ArgStringList &Arguments_,
|
||||
ArrayRef<InputInfo> Inputs)
|
||||
ForceSuccessCommand::ForceSuccessCommand(
|
||||
const Action &Source_, const Tool &Creator_, const char *Executable_,
|
||||
const llvm::opt::ArgStringList &Arguments_, ArrayRef<InputInfo> Inputs)
|
||||
: Command(Source_, Creator_, Executable_, Arguments_, Inputs) {}
|
||||
|
||||
void ForceSuccessCommand::Print(raw_ostream &OS, const char *Terminator,
|
||||
|
|
|
@ -20,6 +20,7 @@ using namespace clang::driver;
|
|||
using namespace clang::driver::toolchains;
|
||||
|
||||
using llvm::opt::ArgList;
|
||||
using llvm::opt::ArgStringList;
|
||||
|
||||
void tools::CrossWindows::Assembler::ConstructJob(
|
||||
Compilation &C, const JobAction &JA, const InputInfo &Output,
|
||||
|
|
Loading…
Reference in New Issue