Ignore:
Timestamp:
Jun 10, 2019, 9:37:23 PM (5 years ago)
Author:
Peter A. Buhr <pabuhr@…>
Branches:
ADT, arm-eh, ast-experimental, enum, forall-pointer-decay, jacob/cs343-translation, jenkins-sandbox, master, new-ast, new-ast-unique-expr, pthread-emulation, qualifiedEnum
Children:
8548c35
Parents:
b326277 (diff), 396037d (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' of plg.uwaterloo.ca:software/cfa/cfa-cc

File:
1 edited

Legend:

Unmodified
Added
Removed

  • src/ResolvExpr/AlternativeFinder.cc

    rb326277 r6ad19fd  
    266266                        SemanticError( expr, "No reasonable alternatives for expression " );
    267267                }
    268                 if ( mode.resolveAssns || mode.prune ) {
     268                if ( mode.satisfyAssns || mode.prune ) {
    269269                        // trim candidates just to those where the assertions resolve
    270270                        // - necessary pre-requisite to pruning
Note: See TracChangeset for help on using the changeset viewer.