Ignore:
Timestamp:
Jul 30, 2015, 3:56:42 PM (7 years ago)
Author:
Peter A. Buhr <pabuhr@…>
Branches:
aaron-thesis, arm-eh, cleanup-dtors, ctor, deferred_resn, demangler, enum, forall-pointer-decay, gc_noraii, jacob/cs343-translation, jenkins-sandbox, master, memory, new-ast, new-ast-unique-expr, new-env, no_list, persistent-indexer, resolv-new, string, with_gc
Children:
f678663
Parents:
7f5566b (diff), b29f8f3 (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 plg2:software/cfa/cfa-cc

File:
1 edited

Legend:

Unmodified
Added
Removed
  • src/ResolvExpr/AlternativeFinder.cc

    r7f5566b r093f1a0  
    697697                        std::list< Type* >::iterator candidate_end = (*i).expr->get_results().begin();
    698698                        std::advance( candidate_end, castExpr->get_results().size() );
    699                         if ( ! unifyList( (*i).expr->get_results().begin(), candidate_end,
    700                                                          castExpr->get_results().begin(), castExpr->get_results().end(), i->env, needAssertions, haveAssertions, openVars, indexer ) ) continue;
    701699                        Cost thisCost = castCostList( (*i).expr->get_results().begin(), candidate_end,
    702700                                                                                  castExpr->get_results().begin(), castExpr->get_results().end(), indexer, i->env );
Note: See TracChangeset for help on using the changeset viewer.