diff --git a/.travis.yml b/.travis.yml index 71addf3..2ca0db1 100644 --- a/.travis.yml +++ b/.travis.yml @@ -7,6 +7,7 @@ os: julia: - 1.0 - 1.4 + - 1.5 - nightly matrix: allow_failures: diff --git a/Project.toml b/Project.toml index 1bf7d74..39c0412 100644 --- a/Project.toml +++ b/Project.toml @@ -1,7 +1,8 @@ name = "ArrayLayouts" uuid = "4c555306-a7a7-4459-81d9-ec55ddd5c99a" authors = ["Sheehan Olver "] -version = "0.3.7" +version = "0.3.8" + [deps] FillArrays = "1a297f60-69ca-5386-bcde-b61e274b549b" diff --git a/src/ArrayLayouts.jl b/src/ArrayLayouts.jl index 19ee416..95be60d 100644 --- a/src/ArrayLayouts.jl +++ b/src/ArrayLayouts.jl @@ -80,8 +80,11 @@ struct ConjPtr{T} ptr::Ptr{T} end -unsafe_convert(::Type{Ptr{T}}, A::Adjoint{<:Real}) where T<:Real = unsafe_convert(Ptr{T}, parent(A)) -unsafe_convert(::Type{Ptr{T}}, A::Transpose) where T = unsafe_convert(Ptr{T}, parent(A)) +if VERSION < v"1.5-" + unsafe_convert(::Type{Ptr{T}}, A::Adjoint{<:Real}) where T<:Real = unsafe_convert(Ptr{T}, parent(A)) + unsafe_convert(::Type{Ptr{T}}, A::Transpose) where T = unsafe_convert(Ptr{T}, parent(A)) +end + # work-around issue with complex conjugation of pointer unsafe_convert(::Type{Ptr{T}}, Ac::Adjoint{<:Complex}) where T<:Complex = unsafe_convert(ConjPtr{T}, parent(Ac)) unsafe_convert(::Type{ConjPtr{T}}, Ac::Adjoint{<:Complex}) where T<:Complex = unsafe_convert(Ptr{T}, parent(Ac))