Merge branch 'master' of git@github.com:rakudo/rakudo

rakudo · Jun 2, 2009 · 24460c8 · 24460c8
2 parents 3f839b2 + b91e089
commit 24460c8
Show file tree

Hide file tree

Showing 2 changed files with 2 additions and 2 deletions.
diff --git a/build/PARROT_REVISION b/build/PARROT_REVISION
@@ -1 +1 @@
-39288
+39308
diff --git a/src/pmc/perl6multisub.pmc b/src/pmc/perl6multisub.pmc
@@ -620,7 +620,7 @@ static PMC* do_dispatch(PARROT_INTERP, PMC *self, candidate_info **candidates, P
     }
 
     /* Check is default trait if we still have multiple options and we want one. */
-    if (possibles_count > 1) {
+    if (possibles_count > 1 && many == MMD_ONE_RESULT) {
         /* Locate any default candidates; if we find multiple defaults, this is
          * no help, so we'll not bother collection just which ones are good. */
         candidate_info *default_cand = NULL;