Skip to content

Commit 93a2531

Browse files
authored
Merge pull request #197 from rdeits/fix-v0.7
remove call to Core.Inference to try to fix v0.7
2 parents 64fc519 + 32a3500 commit 93a2531

File tree

4 files changed

+12
-5
lines changed

4 files changed

+12
-5
lines changed

REQUIRE

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -4,5 +4,5 @@ ShowItLikeYouBuildIt
44
WoodburyMatrices 0.1.5
55
Ratios
66
AxisAlgorithms
7-
Compat 0.19.0
7+
Compat 0.49
88
DualNumbers

src/Interpolations.jl

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -35,6 +35,7 @@ export
3535
# scaling/scaling.jl
3636

3737
using Compat
38+
using Compat.LinearAlgebra
3839
using WoodburyMatrices, Ratios, AxisAlgorithms
3940

4041
import Base: convert, size, indices, getindex, gradient, promote_rule,

src/b-splines/b-splines.jl

Lines changed: 5 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -25,8 +25,11 @@ function BSplineInterpolation(::Type{TWeights}, A::AbstractArray{Tel,N}, ::IT, :
2525
for _ in 2:N
2626
c *= c
2727
end
28-
T = Core.Inference.return_type(*, Tuple{typeof(c), Tel})
29-
28+
if isempty(A)
29+
T = Base.promote_op(*, typeof(c), eltype(A))
30+
else
31+
T = typeof(c * first(A))
32+
end
3033
BSplineInterpolation{T,N,typeof(A),IT,GT,pad}(A)
3134
end
3235

src/gridded/gridded.jl

Lines changed: 5 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -28,8 +28,11 @@ function GriddedInterpolation(::Type{TWeights}, knots::NTuple{N,GridIndex}, A::A
2828
for _ in 2:N
2929
c *= c
3030
end
31-
T = Core.Inference.return_type(*, Tuple{typeof(c), TCoefs})
32-
31+
if isempty(A)
32+
T = Base.promote_op(*, typeof(c), eltype(A))
33+
else
34+
T = typeof(c * first(A))
35+
end
3336
GriddedInterpolation{T,N,TCoefs,IT,typeof(knts),pad}(knts, A)
3437
end
3538

0 commit comments

Comments
 (0)