Changeset 9c23f31 for src/SynTree/SynTree.h

Timestamp:

Sep 24, 2016, 12:19:33 PM (9 years ago)

Author:

Peter A. Buhr <pabuhr@…>

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:

3b5e3aa

Parents:

2298f728 (diff), 7ae930a (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:

fix conflicts

File:

• src/SynTree/SynTree.h (modified) (2 diffs)

src/SynTree/SynTree.h

@@ -81 +81 @@
 class AsmExpr;
 class ImplicitCopyCtorExpr;
+class ConstructorExpr;
+class CompoundLiteralExpr;
 class UntypedValofExpr;
-class CompoundLiteralExpr;
 class RangeExpr;
 
@@ -101 +102 @@
 class AttrType;
 class VarArgsType;
+class ZeroType;
+class OneType;
 
 class Initializer;