Merge pull request #355 from tkoolen/tk/pointer_from_objref

Adapt to Base.data_pointer_from_objref removal

Author: c42f

src/MArray.jl

@@ -98,10 +98,10 @@ end
 
     T = eltype(v)
     if isbits(T)
-        unsafe_store!(Base.unsafe_convert(Ptr{T}, Base.data_pointer_from_objref(v)), convert(T, val), i)
+        unsafe_store!(Base.unsafe_convert(Ptr{T}, pointer_from_objref(v)), convert(T, val), i)
     else
         # This one is unsafe (#27)
-        # unsafe_store!(Base.unsafe_convert(Ptr{Ptr{Void}}, Base.data_pointer_from_objref(v.data)), Base.data_pointer_from_objref(val), i)
+        # unsafe_store!(Base.unsafe_convert(Ptr{Ptr{Void}}, pointer_from_objref(v.data)), pointer_from_objref(val), i)
         error("setindex!() with non-isbits eltype is not supported by StaticArrays. Consider using SizedArray.")
     end
 
@@ -111,7 +111,7 @@ end
 @inline Tuple(v::MArray) = v.data
 
 @inline function Base.unsafe_convert(::Type{Ptr{T}}, a::MArray{S,T}) where {S,T}
-    Base.unsafe_convert(Ptr{T}, Base.data_pointer_from_objref(a))
+    Base.unsafe_convert(Ptr{T}, pointer_from_objref(a))
 end
 
 macro MArray(ex)

src/MMatrix.jl

@@ -74,11 +74,11 @@ show(io::IO, ::Type{MMatrix{N, M, T}}) where {N, M, T} = print(io, "MMatrix{$N,$
 
     # This is nasty... but it turns out Julia will literally copy the whole tuple to the stack otherwise!
     if isbits(T)
-        unsafe_load(Base.unsafe_convert(Ptr{T}, Base.data_pointer_from_objref(m)), i)
+        unsafe_load(Base.unsafe_convert(Ptr{T}, pointer_from_objref(m)), i)
     else
         # Not sure about this... slow option for now...
         m.data[i]
-        #unsafe_load(Base.unsafe_convert(Ptr{Ptr{Void}}, Base.data_pointer_from_objref(m.data)), i)
+        #unsafe_load(Base.unsafe_convert(Ptr{Ptr{Void}}, pointer_from_objref(m.data)), i)
     end
 end
 
@@ -89,10 +89,10 @@ end
     #end
 
     if isbits(T)
-        unsafe_store!(Base.unsafe_convert(Ptr{T}, Base.data_pointer_from_objref(m)), val, i)
+        unsafe_store!(Base.unsafe_convert(Ptr{T}, pointer_from_objref(m)), val, i)
     else # TODO check that this isn't crazy. Also, check it doesn't cause problems with GC...
         # This one is unsafe (#27)
-        # unsafe_store!(Base.unsafe_convert(Ptr{Ptr{Void}}, Base.data_pointer_from_objref(m.data)), Base.data_pointer_from_objref(val), i)
+        # unsafe_store!(Base.unsafe_convert(Ptr{Ptr{Void}}, pointer_from_objref(m.data)), pointer_from_objref(val), i)
         error("setindex!() with non-isbits eltype is not supported by StaticArrays. Consider using SizedArray.")
     end
 

src/MVector.jl

@@ -43,10 +43,10 @@ end
     end
 
     if isbits(T)
-        unsafe_store!(Base.unsafe_convert(Ptr{T}, Base.data_pointer_from_objref(v)), val, i)
+        unsafe_store!(Base.unsafe_convert(Ptr{T}, pointer_from_objref(v)), val, i)
     else
         # This one is unsafe (#27)
-        #unsafe_store!(Base.unsafe_convert(Ptr{Ptr{Void}}, Base.data_pointer_from_objref(v.data)), Base.data_pointer_from_objref(val), i)
+        #unsafe_store!(Base.unsafe_convert(Ptr{Ptr{Void}}, pointer_from_objref(v.data)), pointer_from_objref(val), i)
         error("setindex!() with non-isbits eltype is not supported by StaticArrays. Consider using SizedArray.")
     end
 

src/util.jl

@@ -80,10 +80,10 @@ TrivialView(a::AbstractArray{T,N}) where {T,N} = TrivialView{typeof(a),T,N}(a)
 # See https://github.com/JuliaLang/julia/issues/23826
 # """
 #     drop_sdims(a)
-# 
+#
 # Return an `AbstractArray` with the same elements as `a`, but with static
 # dimensions removed (ie, not a `StaticArray`).
-# 
+#
 # This is useful if you want to override dispatch to call the `Base` version of
 # operations such as `kron` instead of the implementation in `StaticArrays`.
 # Normally you shouldn't need to do this, but it can be more efficient for