Changeset d60ccbf for src/CodeGen/CodeGenerator.h

Timestamp:

Aug 12, 2015, 2:27:31 PM (9 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/CodeGen/CodeGenerator.h (modified) (2 diffs)

src/CodeGen/CodeGenerator.h

@@ -10 +10 @@
 // Created On       : Mon May 18 07:44:20 2015
 // Last Modified By : Rob Schluntz
-// Last Modified On : Wed Jun 17 11:10:58 2015
-// Update Count     : 25
+// Last Modified On : Wed Aug 12 14:27:14 2015
+// Update Count     : 27
 //
 
@@ -65 +65 @@
                 virtual void visit( TupleExpr *tupleExpr );
                 virtual void visit( TypeExpr *typeExpr );
+                virtual void visit( AsmExpr * );
 
                 //*** Statements
                 virtual void visit( CompoundStmt * );
                 virtual void visit( ExprStmt * );
+                virtual void visit( AsmStmt * );
                 virtual void visit( IfStmt * );
                 virtual void visit( SwitchStmt * );