ENH: remove un-needed call to deprecated functorize macro closes #172 (#173)

Author: sglyon

src/b-splines/indexing.jl

@@ -84,7 +84,7 @@ end
 
 # there is a Heisenbug, when Base.promote_op is inlined into getindex_return_type
 # thats why we use this @noinline fence
-@noinline _promote_mul(a,b) = Base.promote_op(@functorize(*), a, b)
+@noinline _promote_mul(a,b) = Base.promote_op(*, a, b)
 
 @noinline function getindex_return_type{T,N,TCoefs,IT<:DimSpec{BSpline},GT<:DimSpec{GridType},Pad}(::Type{BSplineInterpolation{T,N,TCoefs,IT,GT,Pad}}, argtypes::Tuple)
     reduce(_promote_mul, eltype(TCoefs), argtypes)

src/gridded/indexing.jl

@@ -143,7 +143,7 @@ end
 function getindex_return_type{T,N,TCoefs,IT<:DimSpec{Gridded},K,P}(::Type{GriddedInterpolation{T,N,TCoefs,IT,K,P}}, argtypes)
     Tret = TCoefs
     for a in argtypes
-        Tret = Base.promote_op(@functorize(*), Tret, a) # the macro is used to support julia 0.4
+        Tret = Base.promote_op(*, Tret, a) # the macro is used to support julia 0.4
     end
     Tret
-end
+end

test/b-splines/multivalued.jl

@@ -20,8 +20,8 @@ end
 (/)(p::MyPair, n::Number) = MyPair(p.first/n, p.second/n)
 Base.zero{T}(::Type{MyPair{T}}) = MyPair(zero(T),zero(T))
 Base.promote_rule{T1,T2<:Number}(::Type{MyPair{T1}}, ::Type{T2}) = MyPair{promote_type(T1,T2)}
-Base.promote_op{T1,T2<:Number}(::typeof(@functorize(*)), ::Type{MyPair{T1}}, ::Type{T2}) = MyPair{promote_type(T1,T2)}
-Base.promote_op{T1<:Number,T2}(::typeof(@functorize(*)), ::Type{T1}, ::Type{MyPair{T2}}) = MyPair{promote_type(T1,T2)}
+Base.promote_op{T1,T2<:Number}(::typeof(*), ::Type{MyPair{T1}}, ::Type{T2}) = MyPair{promote_type(T1,T2)}
+Base.promote_op{T1<:Number,T2}(::typeof(*), ::Type{T1}, ::Type{MyPair{T2}}) = MyPair{promote_type(T1,T2)}
 
 # 1d
 A = reinterpret(MyPair{Float64}, rand(2, 10), (10,))