Revert "Move using directive from Job.h to Job.cpp" (r190902)

Seems like it was intentional to export ArgStringList as
driver::ArgStringList, and e.g. examples/clang-interpreter/main.cpp
uses it this way.

However, exporting it with a typedef seems like a more common way to do it.

git-svn-id: https://llvm.org/svn/llvm-project/cfe/trunk@190906 91177308-0d34-0410-b5e6-96231b3b80d8

diff --git a/include/clang/Driver/Job.h b/include/clang/Driver/Job.h
index c4e6a3118541a620a5825af6a45fb39ee982c3cc..7b91e4e9e487aba29bda016c0bc80f1bf31d344f 100644 (file)
--- a/include/clang/Driver/Job.h
+++ b/include/clang/Driver/Job.h
@@ -24,6 +24,9 @@ class Action;
 class Command;
 class Tool;
 
+// Users of this class will use clang::driver::ArgStringList.
+typedef llvm::opt::ArgStringList ArgStringList;
+
 class Job {
 public:
   enum JobClass {
@@ -65,11 +68,11 @@ class Command : public Job {
 
   /// The list of program arguments (not including the implicit first
   /// argument, which will be the executable).
-  llvm::opt::ArgStringList Arguments;
+  ArgStringList Arguments;
 
 public:
   Command(const Action &_Source, const Tool &_Creator, const char *_Executable,
-          const llvm::opt::ArgStringList &_Arguments);
+          const ArgStringList &_Arguments);
 
   virtual void Print(llvm::raw_ostream &OS, const char *Terminator,
                      bool Quote, bool CrashReport = false) const;
@@ -83,7 +86,7 @@ public:
   /// getCreator - Return the Tool which caused the creation of this job.
   const Tool &getCreator() const { return Creator; }
 
-  const llvm::opt::ArgStringList &getArguments() const { return Arguments; }
+  const 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 43518ad8f970f7ee2f83808017c645969185849f..4e4c664c8f72dc044583fa451f87f72f316d9b57 100644 (file)
--- a/lib/Driver/Job.cpp
+++ b/lib/Driver/Job.cpp
@@ -15,7 +15,6 @@
 #include "llvm/Support/raw_ostream.h"
 #include <cassert>
 using namespace clang::driver;
-using llvm::opt::ArgStringList;
 using llvm::raw_ostream;
 using llvm::StringRef;