Skip to content

Commit 5a76562

Browse files
authored
Merge pull request #168 from mweastwood/fix-ambiguity
fix a method ambiguity error in unsafe_convert for FieldVectors
2 parents 433577d + c81a42b commit 5a76562

File tree

1 file changed

+3
-5
lines changed

1 file changed

+3
-5
lines changed

src/FieldVector.jl

Lines changed: 3 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -23,8 +23,6 @@ abstract type FieldVector{N, T} <: StaticVector{N, T} end
2323
@propagate_inbounds setindex!(v::FieldVector, x, i::Int) = setfield!(v, i, x)
2424

2525
# See #53
26-
Base.cconvert{T}(::Type{Ptr{T}}, v::FieldVector) = Base.RefValue(v)
27-
Base.unsafe_convert{T, FV <: FieldVector}(::Type{Ptr{T}}, m::Base.RefValue{FV}) =
28-
_unsafe_convert(Ptr{T}, eltype(FV), m)
29-
_unsafe_convert{T, FV <: FieldVector}(::Type{Ptr{T}}, ::Type{T}, m::Base.RefValue{FV}) =
30-
Ptr{T}(Base.unsafe_convert(Ptr{FV}, m))
26+
Base.cconvert(::Type{<:Ptr}, v::FieldVector) = Base.RefValue(v)
27+
Base.unsafe_convert(::Type{Ptr{T}}, m::Base.RefValue{FV}) where {N,T,FV<:FieldVector{N,T}} =
28+
Ptr{T}(Base.unsafe_convert(Ptr{FV}, m))

0 commit comments

Comments
 (0)