Driver: Sink Driver/Compilation into clang::driver namespace.

 - Add OptTable instance to Driver.

llvm-svn: 66063

1 files changed, 9 insertions, 3 deletions

diff --git a/clang/lib/Driver/Driver.cpp b/clang/lib/Driver/Driver.cpp
index f464acf8eba..d3c959499a1 100644
--- a/clang/lib/Driver/Driver.cpp
+++ b/clang/lib/Driver/Driver.cpp
@@ -7,14 +7,20 @@
 //
 //===----------------------------------------------------------------------===//
 
-#include "clang/Driver/Compilation.h"
 #include "clang/Driver/Driver.h"
-using namespace clang;
 
-Driver::Driver() {
+#include "clang/Driver/Arg.h"
+#include "clang/Driver/ArgList.h"
+#include "clang/Driver/Compilation.h"
+#include "clang/Driver/Options.h"
+using namespace clang::driver;
+
+Driver::Driver() : Opts(new OptTable()) {
+  
 }
 
 Driver::~Driver() {
+  delete Opts;
 }
 
 Compilation *Driver::BuildCompilation(int argc, const char **argv) {