From 5c6ecf5a07317edc4a01f967a43eb3f76142d387 Mon Sep 17 00:00:00 2001 From: Hans Wennborg Date: Wed, 18 Sep 2013 00:21:51 +0000 Subject: [PATCH] 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 --- include/clang/Driver/Job.h | 9 ++++----- lib/Driver/Job.cpp | 5 +++-- 2 files changed, 7 insertions(+), 7 deletions(-) diff --git a/include/clang/Driver/Job.h b/include/clang/Driver/Job.h index 7b91e4e9e4..161fda19b2 100644 --- a/include/clang/Driver/Job.h +++ b/include/clang/Driver/Job.h @@ -24,8 +24,7 @@ class Action; class Command; class Tool; -// Users of this class will use clang::driver::ArgStringList. -typedef llvm::opt::ArgStringList ArgStringList; +using llvm::opt::ArgStringList; class Job { public: @@ -68,11 +67,11 @@ class Command : public Job { /// The list of program arguments (not including the implicit first /// argument, which will be the executable). - ArgStringList Arguments; + llvm::opt::ArgStringList Arguments; public: Command(const Action &_Source, const Tool &_Creator, const char *_Executable, - const ArgStringList &_Arguments); + const llvm::opt::ArgStringList &_Arguments); virtual void Print(llvm::raw_ostream &OS, const char *Terminator, bool Quote, bool CrashReport = false) const; @@ -86,7 +85,7 @@ public: /// getCreator - Return the Tool which caused the creation of this job. const Tool &getCreator() const { return Creator; } - const ArgStringList &getArguments() const { return Arguments; } + const llvm::opt::ArgStringList &getArguments() const { return Arguments; } static bool classof(const Job *J) { return J->getKind() == CommandClass; diff --git a/lib/Driver/Job.cpp b/lib/Driver/Job.cpp index 4e4c664c8f..0a783eb93b 100644 --- a/lib/Driver/Job.cpp +++ b/lib/Driver/Job.cpp @@ -21,7 +21,8 @@ using llvm::StringRef; 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 @@ void Command::Print(raw_ostream &OS, const char *Terminator, bool Quote, 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 Argv; Argv.push_back(Executable); -- 2.40.0