Changeset d60ccbf for src/SynTree/SynTree.h

Timestamp:

Aug 12, 2015, 2:27:31 PM (10 years ago)

Author:

Rob Schluntz <rschlunt@…>

Branches:

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

Children:

f32c7f4

Parents:

e45215c (diff), e869d663 (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 designate

Conflicts:

src/CodeGen/CodeGenerator.h

File:

• src/SynTree/SynTree.h (modified) (3 diffs)

src/SynTree/SynTree.h

@@ -10 +10 @@
 // Created On       : Mon May 18 07:44:20 2015
 // Last Modified By : Peter A. Buhr
-// Last Modified On : Mon May 18 10:58:22 2015
-// Update Count     : 1
+// Last Modified On : Thu Jul 23 23:25:04 2015
+// Update Count     : 3
 //
 
@@ -40 +40 @@
 class CompoundStmt;
 class ExprStmt;
+class AsmStmt;
 class IfStmt;
 class WhileStmt;
@@ -75 +76 @@
 class SolvedTupleExpr;
 class TypeExpr;
+class AsmExpr;
 class UntypedValofExpr;