Changeset b5b0907 for src/Parser/parser.h

Timestamp:

Jun 15, 2015, 12:45:26 PM (11 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:

94b4364

Parents:

ea9b9d3 (diff), a1d5d2a (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

File:

• src/Parser/parser.h (modified) (1 diff)

src/Parser/parser.h

@@ -252 +252 @@
         ExpressionNode *en;
         DeclarationNode *decl;
-        DeclarationNode::TyCon aggKey;
+        DeclarationNode::Aggregate aggKey;
         DeclarationNode::TypeClass tclass;
         StatementNode *sn;