From 7f208474fa4de38f2681695f3e87f1c67086bff8 Mon Sep 17 00:00:00 2001
From: Sheehan Olver <solver@mac.com>
Date: Wed, 1 Jul 2020 14:53:27 +0100
Subject: [PATCH 1/2] Fix for Julia v1.5

---
 .travis.yml         | 1 +
 src/ArrayLayouts.jl | 7 +++++--
 2 files changed, 6 insertions(+), 2 deletions(-)

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/src/ArrayLayouts.jl b/src/ArrayLayouts.jl
index a2ec30b..08e29c4 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))

From 732890e567a36cbfc3fc13cf9d11522e8bf35629 Mon Sep 17 00:00:00 2001
From: Sheehan Olver <solver@mac.com>
Date: Wed, 1 Jul 2020 16:05:29 +0100
Subject: [PATCH 2/2] v0.3.6

---
 Project.toml | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/Project.toml b/Project.toml
index 124a6e1..c9bfabf 100644
--- a/Project.toml
+++ b/Project.toml
@@ -1,7 +1,7 @@
 name = "ArrayLayouts"
 uuid = "4c555306-a7a7-4459-81d9-ec55ddd5c99a"
 authors = ["Sheehan Olver <solver@mac.com>"]
-version = "0.3.5"
+version = "0.3.6"
 
 [deps]
 FillArrays = "1a297f60-69ca-5386-bcde-b61e274b549b"