Ignore:
Timestamp:
Jul 24, 2019, 10:42:18 AM (5 years ago)
Author:
Thierry Delisle <tdelisle@…>
Branches:
ADT, arm-eh, ast-experimental, enum, forall-pointer-decay, jacob/cs343-translation, master, new-ast, new-ast-unique-expr, pthread-emulation, qualifiedEnum
Children:
504eb72
Parents:
4eb43fa (diff), 83b52f1 (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 new-ast

File:
1 edited

Legend:

Unmodified
Added
Removed
  • src/ResolvExpr/Alternative.h

    r4eb43fa r96ac72c  
    2929        /// One assertion to resolve
    3030        struct AssertionItem {
    31                 DeclarationWithType* decl;
     31                const DeclarationWithType* decl;
    3232                AssertionSetValue info;
    33                
     33
    3434                AssertionItem() = default;
    35                 AssertionItem( DeclarationWithType* decl, const AssertionSetValue& info )
     35                AssertionItem( const DeclarationWithType* decl, const AssertionSetValue& info )
    3636                : decl(decl), info(info) {}
    3737                AssertionItem( const AssertionSet::value_type& e ) : decl(e.first), info(e.second) {}
Note: See TracChangeset for help on using the changeset viewer.