Merge pull request #138 from bcmichael/master

Try to unsafe_convert PtrOrCuPtr in opposite order
JuliaGPU · Apr 12, 2019 · 778a074 · 778a074
2 parents d899dd5 + 7779037
commit 778a074
Showing 1 changed file with 3 additions and 3 deletions.
diff --git a/src/pointer.jl b/src/pointer.jl
@@ -111,10 +111,10 @@ end
 
 function Base.unsafe_convert(::Type{PtrOrCuPtr{T}}, val) where {T}
     # TODO: this should try/catch since the fallback for `unsafe_convert{Ptr}` calls error
-    ptr = if applicable(Base.unsafe_convert, CuPtr{T}, val)
-        Base.unsafe_convert(CuPtr{T}, val)
-    elseif applicable(Base.unsafe_convert, Ptr{T}, val)
+    ptr = if applicable(Base.unsafe_convert, Ptr{T}, val)
         Base.unsafe_convert(Ptr{T}, val)
+    elseif applicable(Base.unsafe_convert, CuPtr{T}, val)
+        Base.unsafe_convert(CuPtr{T}, val)
     else
         throw(ArgumentError("cannot convert to either a CPU or GPU pointer"))
     end