Fix disambiguation error in julia 0.5

Author: Tomas Lycken

src/b-splines/indexing.jl

@@ -98,11 +98,14 @@ end
     :(gradient!(g, itp, $(args...)))
 end
 
-@generated function gradient{T,N}(itp::AbstractInterpolation{T,N}, xs...)
-    n = count_interp_dims(itp, N)
-    Tg = promote_type(T, [x <: AbstractArray ? eltype(x) : x for x in xs]...)
-    xargs = [:(xs[$d]) for d in 1:length(xs)]
-    :(gradient!(Array($Tg,$n), itp, $(xargs...)))
+# @eval uglyness required for disambiguation with method in Base
+for R in [:Real, :Any]
+    @eval @generated function gradient{T,N}(itp::AbstractInterpolation{T,N}, xs::$R...)
+        n = count_interp_dims(itp, N)
+        Tg = promote_type(T, [x <: AbstractArray ? eltype(x) : x for x in xs]...)
+        xargs = [:(xs[$d]) for d in 1:length(xs)]
+        :(gradient!(Array($Tg,$n), itp, $(xargs...)))
+    end
 end
 
 gradient1{T}(itp::AbstractInterpolation{T,1}, x) = gradient(itp, x)[1]

src/scaling/scaling.jl

@@ -68,7 +68,11 @@ coordlookup(i::Bool, r::Range, x) = i ? coordlookup(r, x) : convert(typeof(coord
 basetype{T,N,ITPT,IT,GT,RT}(::Type{ScaledInterpolation{T,N,ITPT,IT,GT,RT}}) = ITPT
 basetype(sitp::ScaledInterpolation) = basetype(typeof(sitp))
 
-gradient{T,N,ITPT,IT<:DimSpec}(sitp::ScaledInterpolation{T,N,ITPT,IT}, xs::Number...) = gradient!(Array(T,count_interp_dims(IT,N)), sitp, xs...)
+# @eval uglyness required for disambiguation with method in b-splies/indexing.jl
+# also, GT is only specified to avoid disambiguation warnings on julia 0.4
+gradient{T,N,ITPT,IT<:DimSpec{InterpolationType}}(sitp::ScaledInterpolation{T,N,ITPT,IT}, xs::Real...) = gradient!(Array(T,count_interp_dims(IT,N)), sitp, xs...)
+gradient{T,N,ITPT,IT<:DimSpec{InterpolationType}}(sitp::ScaledInterpolation{T,N,ITPT,IT}, xs...) = gradient!(Array(T,count_interp_dims(IT,N)), sitp, xs...)
+
 @generated function gradient!{T,N,ITPT,IT}(g, sitp::ScaledInterpolation{T,N,ITPT,IT}, xs::Number...)
     ndims(g) == 1 || throw(DimensionMismatch("g must be a vector (but had $(ndims(g)) dimensions)"))
     length(xs) == N || throw(DimensionMismatch("Must index into $N-dimensional scaled interpolation object with exactly $N indices (you used $(length(xs)))"))