Revert r190902 and r190906
The first one broke the build, and the latter one made it worse.
git-svn-id: https://llvm.org/svn/llvm-project/cfe/trunk@190907 91177308-0d34-0410-b5e6-96231b3b80d8
diff --git a/lib/Driver/Job.cpp b/lib/Driver/Job.cpp
index 4e4c664..0a783eb 100644
--- a/lib/Driver/Job.cpp
+++ b/lib/Driver/Job.cpp
@@ -21,7 +21,8 @@
Job::~Job() {}
Command::Command(const Action &_Source, const Tool &_Creator,
- const char *_Executable, const ArgStringList &_Arguments)
+ const char *_Executable,
+ const llvm::opt::ArgStringList &_Arguments)
: Job(CommandClass), Source(_Source), Creator(_Creator),
Executable(_Executable), Arguments(_Arguments) {}
@@ -112,7 +113,7 @@
OS << Terminator;
}
-int Command::Execute(const StringRef **Redirects, std::string *ErrMsg,
+int Command::Execute(const llvm::StringRef **Redirects, std::string *ErrMsg,
bool *ExecutionFailed) const {
SmallVector<const char*, 128> Argv;
Argv.push_back(Executable);