Changeset 94e0864d for src/SynTree/CompoundStmt.cc

Timestamp:

Jun 24, 2015, 4:12:31 PM (7 years ago)

Author:

Rob Schluntz <rschlunt@…>

Branches:

aaron-thesis, arm-eh, 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, resolv-new, string, with_gc

Children:

1869adf

Parents:

94b4364 (diff), de62360d (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 resolver

Conflicts:

src/CodeGen/CodeGenerator.cc
src/Parser/ExpressionNode.cc
src/ResolvExpr/Resolver.cc

File:

• src/SynTree/CompoundStmt.cc (modified) (2 diffs)

src/SynTree/CompoundStmt.cc

@@ -10 +10 @@
 // Created On       : Mon May 18 07:44:20 2015
 // Last Modified By : Peter A. Buhr
-// Last Modified On : Fri Jun  5 07:46:03 2015
-// Update Count     : 2
+// Last Modified On : Tue Jun 23 11:37:49 2015
+// Update Count     : 3
 //
 
@@ -33 +33 @@
 }
 
-void CompoundStmt::print( std::ostream &os, int indent ) {
+void CompoundStmt::print( std::ostream &os, int indent ) const {
         os << string( indent, ' ' ) << "CompoundStmt" << endl ;
         printAll( kids, os, indent + 2 );