Skip to content

Commit b3c3ba7

Browse files
carlobaldassiTomas Lycken
authored andcommitted
Fix MulFun deprecation warnings (using Compat)
1 parent 7c2c400 commit b3c3ba7

File tree

4 files changed

+4
-2
lines changed

4 files changed

+4
-2
lines changed

REQUIRE

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -3,3 +3,4 @@ julia 0.4
33
WoodburyMatrices 0.1.5
44
Ratios
55
AxisAlgorithms
6+
Compat 0.8.0

src/Interpolations.jl

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -32,6 +32,7 @@ export
3232
# extrapolation/extrapolation.jl
3333
# scaling/scaling.jl
3434

35+
using Compat
3536
using WoodburyMatrices, Ratios, AxisAlgorithms
3637

3738
import Base: convert, size, getindex, gradient, scale, promote_rule, ndims, eltype

src/b-splines/indexing.jl

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -82,7 +82,7 @@ end
8282
function getindex_return_type{T,N,TCoefs,IT<:DimSpec{BSpline},GT<:DimSpec{GridType},Pad}(::Type{BSplineInterpolation{T,N,TCoefs,IT,GT,Pad}}, argtypes)
8383
Tret = eltype(TCoefs)
8484
for a in argtypes
85-
Tret = Base.promote_op(Base.MulFun, Tret, a)
85+
Tret = Base.promote_op(@functorize(*), Tret, a) # the macro is used to support julia 0.4
8686
end
8787
Tret
8888
end

src/gridded/indexing.jl

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -143,7 +143,7 @@ end
143143
function getindex_return_type{T,N,TCoefs,IT<:DimSpec{Gridded},K,P}(::Type{GriddedInterpolation{T,N,TCoefs,IT,K,P}}, argtypes)
144144
Tret = TCoefs
145145
for a in argtypes
146-
Tret = Base.promote_op(Base.MulFun, Tret, a)
146+
Tret = Base.promote_op(@functorize(*), Tret, a) # the macro is used to support julia 0.4
147147
end
148148
Tret
149149
end

0 commit comments

Comments
 (0)