Ignore:
Timestamp:
Apr 19, 2018, 6:11:07 PM (6 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, with_gc
Children:
8633f060
Parents:
9dc31c10 (diff), 60ba456 (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 conflict

File:
1 edited

Legend:

Unmodified
Added
Removed
  • src/Parser/DeclarationNode.cc

    r9dc31c10 rc28afead  
    928928                                delete newType->aggInst.aggregate->enumeration.constants;
    929929                                newType->aggInst.aggregate->enumeration.constants = nullptr;
     930                                newType->aggInst.aggregate->enumeration.body = false;
    930931                        } else {
    931932                                assert( newType->aggInst.aggregate->kind == TypeData::Aggregate );
    932933                                delete newType->aggInst.aggregate->aggregate.fields;
    933934                                newType->aggInst.aggregate->aggregate.fields = nullptr;
     935                                newType->aggInst.aggregate->aggregate.body = false;
    934936                        } // if
    935937                        // don't hoist twice
Note: See TracChangeset for help on using the changeset viewer.