1 files changed, 9 insertions, 2 deletions
diff --git a/utils/TableGen/FileLexer.l b/utils/TableGen/FileLexer.l
index 0858a8c..48070b34 100644
--- a/utils/TableGen/FileLexer.l
+++ b/utils/TableGen/FileLexer.l
@@ -28,9 +28,13 @@
 
 %{
 #include "Record.h"
-typedef std::pair<Record*, std::vector<Init*>*> SubClassRefTy;
+typedef std::pair<llvm::Record*, std::vector<llvm::Init*>*> SubClassRefTy;
 #include "FileParser.h"
 
+int Fileparse();
+
+namespace llvm {
+
 // Global variable recording the location of the include directory
 std::string IncludeDirectory;
 
@@ -69,7 +73,6 @@ std::ostream &err() {
 }
 
 
-int Fileparse();
 
 //
 // Function: ParseFile()
@@ -171,6 +174,10 @@ int yywrap() {
   return 0;
 }
 
+} // End llvm namespace
+
+using namespace llvm;
+
 %}
 
 Comment      \/\/.*