Changeset 4819cac for src/SymTab

Timestamp:

Aug 4, 2016, 4:11:11 PM (8 years ago)

Author:

Rob Schluntz <rschlunt@…>

Branches:

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

Children:

4e2a1137

Parents:

f9cebb5 (diff), cf37a8e (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 ctor

Conflicts:

src/CodeGen/CodeGenerator.cc

File:

• src/SymTab/AddVisit.h (modified) (2 diffs)

src/SymTab/AddVisit.h

@@ -10 +10 @@
 // Created On       : Sun May 17 16:14:32 2015
 // Last Modified By : Peter A. Buhr
-// Last Modified On : Tue Jul 12 17:46:33 2016
-// Update Count     : 6
+// Last Modified On : Thu Aug  4 11:22:01 2016
+// Update Count     : 9
 //
 
@@ -33 +33 @@
         template< typename Visitor >
         inline void addVisit(SwitchStmt *switchStmt, Visitor &visitor) {
-                addVisitStatementList( switchStmt->get_branches(), visitor );
+                addVisitStatementList( switchStmt->get_statements(), visitor );
                 maybeAccept( switchStmt->get_condition(), visitor );
         }