fix deprecated a[i:] syntax and a merge error where fdwatcher_reinit …

…should be fdwatcher_init.
JuliaLang · Apr 2, 2014 · 4d88d8e · 4d88d8e
1 parent baa1acc
commit 4d88d8e
Show file tree

Hide file tree

Showing 2 changed files with 2 additions and 2 deletions.
diff --git a/base/inference.jl b/base/inference.jl
@@ -2378,7 +2378,7 @@ function inlining_pass(e::Expr, sv, ast)
         end
 
         for ninline = 1:100
-            atypes = tuple(map(exprtype, e.args[2:])...)
+            atypes = tuple(map(exprtype, e.args[2:end])...)
             if length(atypes) > MAX_TUPLETYPE_LEN
                 atypes = limit_tuple_type(atypes)
             end

diff --git a/base/poll.jl b/base/poll.jl
@@ -171,7 +171,7 @@ end
 # on unix
 
 let
-    global fdwatcher_reinit, wait
+    global fdwatcher_init, wait
     @unix_only begin
         local fdwatcher_array
         function fdwatcher_init()