Merge branch 'master' of https://github.com/JuliaLang/julia

JuliaLang · Jun 19, 2011 · 83ec761 · 83ec761
2 parents 5a3a449 + 9546650
commit 83ec761
Show file tree

Hide file tree

Showing 2 changed files with 4 additions and 2 deletions.
diff --git a/j/multi.j b/j/multi.j
@@ -1096,7 +1096,6 @@ end
 
 macro bcast(thk)
     quote
-        $thk
         at_each(()->eval($expr(:quote,thk)))
     end
 end

diff --git a/src/gf.c b/src/gf.c
@@ -998,7 +998,10 @@ JL_CALLABLE(jl_apply_generic)
         return jl_no_method_error((jl_function_t*)jl_t2(env), args, nargs);
     }
 
-    return jl_apply(mfunc, args, nargs);
+    JL_GC_PUSH(&mfunc);
+    jl_value_t *result = jl_apply(mfunc, args, nargs);
+    JL_GC_POP();
+    return result;
 }
 
 static void print_methlist(char *name, jl_methlist_t *ml)