Merge pull request #147 from JuliaArrays/ambiguous-unsafe-convert

Clean up and fix pointer code

Author: c42f

src/FieldVector.jl

@@ -23,8 +23,8 @@ abstract type FieldVector{N, T} <: StaticVector{N, T} end
 @propagate_inbounds setindex!(v::FieldVector, x, i::Int) = setfield!(v, i, x)
 
 # See #53
-Base.cconvert{T}(::Type{Ptr{T}}, v::FieldVector) = Ref(v)
-Base.unsafe_convert{T, FV <: FieldVector}(::Type{Ptr{T}}, m::Ref{FV}) =
+Base.cconvert{T}(::Type{Ptr{T}}, v::FieldVector) = Base.RefValue(v)
+Base.unsafe_convert{T, FV <: FieldVector}(::Type{Ptr{T}}, m::Base.RefValue{FV}) =
     _unsafe_convert(Ptr{T}, eltype(FV), m)
-_unsafe_convert{T, FV <: FieldVector}(::Type{Ptr{T}}, ::Type{T}, m::Ref{FV}) =
+_unsafe_convert{T, FV <: FieldVector}(::Type{Ptr{T}}, ::Type{T}, m::Base.RefValue{FV}) =
          Ptr{T}(Base.unsafe_convert(Ptr{FV}, m))

src/MMatrix.jl

@@ -101,10 +101,6 @@ end
 
 @inline Tuple(v::MMatrix) = v.data
 
-@inline function Base.unsafe_convert{N,M,T}(::Type{Ptr{T}}, m::MMatrix{N,M,T})
-    Base.unsafe_convert(Ptr{T}, Base.data_pointer_from_objref(m))
-end
-
 macro MMatrix(ex)
     if !isa(ex, Expr)
         error("Bad input for @MMatrix")

src/MVector.jl

@@ -55,10 +55,6 @@ end
 
 @inline Tuple(v::MVector) = v.data
 
-@inline function Base.unsafe_convert{N,T}(::Type{Ptr{T}}, v::MVector{N,T})
-    Base.unsafe_convert(Ptr{T}, Base.data_pointer_from_objref(v))
-end
-
 macro MVector(ex)
     if isa(ex, Expr) && ex.head == :vect
         return esc(Expr(:call, MVector{length(ex.args)}, Expr(:tuple, ex.args...)))

src/SArray.jl

@@ -73,8 +73,8 @@ end
 @inline Tuple(v::SArray) = v.data
 
 # See #53
-Base.cconvert{T}(::Type{Ptr{T}}, a::SArray) = Ref(a)
-Base.unsafe_convert{S,T,D,L}(::Type{Ptr{T}}, a::Ref{SArray{S,T,D,L}}) =
+Base.cconvert{T}(::Type{Ptr{T}}, a::SArray) = Base.RefValue(a)
+Base.unsafe_convert{S,T,D,L}(::Type{Ptr{T}}, a::Base.RefValue{SArray{S,T,D,L}}) =
     Ptr{T}(Base.unsafe_convert(Ptr{SArray{S,T,D,L}}, a))
 
 macro SArray(ex)

src/SMatrix.jl

@@ -74,12 +74,6 @@ end
 
 @inline Tuple(v::SMatrix) = v.data
 
-# See #53
-Base.cconvert{T}(::Type{Ptr{T}}, m::SMatrix) = Ref(m)
-Base.unsafe_convert{N,M,T,L}(::Type{Ptr{T}}, m::Ref{SMatrix{N,M,T,L}}) =
-    Ptr{T}(Base.unsafe_convert(Ptr{SMatrix{N,M,T,L}}, m))
-
-
 macro SMatrix(ex)
     if !isa(ex, Expr)
         error("Bad input for @SMatrix")

src/SVector.jl

@@ -39,11 +39,6 @@ end
 
 @inline Tuple(v::SVector) = v.data
 
-# See #53
-Base.cconvert{T}(::Type{Ptr{T}}, v::SVector) = Ref(v)
-Base.unsafe_convert{N,T}(::Type{Ptr{T}}, v::Ref{SVector{N,T}}) =
-    Ptr{T}(Base.unsafe_convert(Ptr{SVector{N,T}}, v))
-
 # Converting a CartesianIndex to an SVector
 convert(::Type{SVector}, I::CartesianIndex) = SVector(I.I)
 convert{N}(::Type{SVector{N}}, I::CartesianIndex{N}) = SVector{N}(I.I)

test/FieldVector.jl

@@ -33,6 +33,9 @@
         @test @inferred(similar_type(Point3D, Float32)) == SVector{3,Float32}
         @test @inferred(similar_type(Point3D, Size(4))) == SVector{4,Float64}
         @test @inferred(similar_type(Point3D, Float32, Size(4))) == SVector{4,Float32}
+
+        # Issue 146
+        @test [[Point3D(1.0,2.0,3.0)]; [Point3D(4.0,5.0,6.0)]]::Vector{Point3D} == [Point3D(1.0,2.0,3.0), Point3D(4.0,5.0,6.0)]
     end
 
     @testset "Mutable Point2D" begin