Changeset a12d5aa for src/Parser/TypedefTable.h

Timestamp:

Jun 29, 2017, 5:13:42 PM (7 years ago)

Author:

Rob Schluntz <rschlunt@…>

Branches:

ADT, aaron-thesis, arm-eh, ast-experimental, cleanup-dtors, deferred_resn, demangler, enum, forall-pointer-decay, jacob/cs343-translation, jenkins-sandbox, master, new-ast, new-ast-unique-expr, new-env, no_list, persistent-indexer, pthread-emulation, qualifiedEnum, resolv-new, with_gc

Children:

435e75f

Parents:

62423350 (diff), 1abc5ab (diff)
Note: this is a merge changeset, the changes displayed below correspond to the merge itself.
Use the (diff) links above to see all the changes relative to each parent.

Message:

Merge branch 'master' into designations

File:

• src/Parser/TypedefTable.h (modified) (2 diffs)

src/Parser/TypedefTable.h

@@ -10 +10 @@
 // Created On       : Sat May 16 15:24:36 2015
 // Last Modified By : Peter A. Buhr
-// Last Modified On : Mon Aug 15 18:25:04 2016
-// Update Count     : 28
+// Last Modified On : Wed Jun 28 21:56:34 2017
+// Update Count     : 33
 //
 
@@ -22 +22 @@
 #include <stack>
 
-#include "lex.h"
+#include "parser.hh"
 #include "parser.h"