diff options
Diffstat (limited to 'clang/lib/Driver')
| -rw-r--r-- | clang/lib/Driver/Job.cpp | 13 | ||||
| -rw-r--r-- | clang/lib/Driver/ToolChains/CrossWindows.cpp | 1 |
2 files changed, 7 insertions, 7 deletions
diff --git a/clang/lib/Driver/Job.cpp b/clang/lib/Driver/Job.cpp index bd1a9bd8e3e..b6322b6ce2b 100644 --- a/clang/lib/Driver/Job.cpp +++ b/clang/lib/Driver/Job.cpp @@ -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, diff --git a/clang/lib/Driver/ToolChains/CrossWindows.cpp b/clang/lib/Driver/ToolChains/CrossWindows.cpp index 6ca04a8a3ab..795356026fb 100644 --- a/clang/lib/Driver/ToolChains/CrossWindows.cpp +++ b/clang/lib/Driver/ToolChains/CrossWindows.cpp @@ -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, |
