Changeset 436c0de for src/CodeGen/CodeGenerator.h

Timestamp:

Jun 18, 2017, 9:22:22 AM (9 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:

f1e80d8

Parents:

ade20d0 (diff), 42b0d73 (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' of plg.uwaterloo.ca:/u/cforall/software/cfa/cfa-cc

Conflicts:

src/InitTweak/GenInit.cc

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 : Andrew Beach
-// Last Modified On : Wed May 10 10:57:00 2017
-// Update Count     : 51
+// Last Modified On : Thu Jun  8 15:48:00 2017
+// Update Count     : 52
 //
 
@@ -91 +91 @@
                 virtual void visit( BranchStmt * );
                 virtual void visit( ReturnStmt * );
+                virtual void visit( ThrowStmt * );
                 virtual void visit( WhileStmt * );
                 virtual void visit( ForStmt * );