Ignore:
Timestamp:
Apr 5, 2017, 9:05:36 PM (5 years ago)
Author:
Peter A. Buhr <pabuhr@…>
Branches:
aaron-thesis, arm-eh, cleanup-dtors, deferred_resn, demangler, jacob/cs343-translation, jenkins-sandbox, master, new-ast, new-ast-unique-expr, new-env, no_list, persistent-indexer, resolv-new, with_gc
Children:
2264c11
Parents:
2f0a3599 (diff), 5671b8d (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 merge conflict

File:
1 edited

Legend:

Unmodified
Added
Removed
  • doc/generic_types/evaluation/cfa-stack.c

    r2f0a3599 r80cdb2f  
    88
    99forall(otype T) void ?{}(stack(T)* s) {
    10         ?{}( s->head, 0 );
     10        ?{}( &s->head, 0 );
    1111}
    1212
     
    2525
    2626forall(otype T) void push(stack(T)* s, T value) {
    27         s->head = new( value, s->head );
     27        s->head = ((stack_node(T)*)malloc()){ value, s->head };
    2828}
    2929
Note: See TracChangeset for help on using the changeset viewer.