Ignore:
Timestamp:
Nov 11, 2016, 1:31:34 PM (8 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:
33a7b6d
Parents:
30b65d8 (diff), 668e971a (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 tuples

File:
1 edited

Legend:

Unmodified
Added
Removed
  • src/ResolvExpr/Resolver.cc

    r30b65d8 r8f9cc50  
    7272                Type * functionReturn = nullptr;
    7373                Type *initContext = nullptr;
    74                 Type *switchType = nullptr;
    7574                bool inEnumDecl = false;
    7675        };
Note: See TracChangeset for help on using the changeset viewer.