Fix deprecations

JuliaParallel · May 31, 2018 · b12e1a2 · b12e1a2
1 parent 50fe804
commit b12e1a2
Show file tree

Hide file tree

Showing 2 changed files with 3 additions and 3 deletions.
diff --git a/src/array/darray.jl b/src/array/darray.jl
@@ -113,7 +113,7 @@ function serialize(io::AbstractSerializer, A::DArray)
     invoke(serialize, Tuple{AbstractSerializer,Any}, io, A)
 end
 
-function deserialize{T,N,F}(io::AbstractSerializer, dt::Type{DArray{T,N,F}})
+function deserialize(io::AbstractSerializer, dt::Type{DArray{T,N,F}}) where {T,N,F}
     nf = nfields(dt)
     A = ccall(:jl_new_struct_uninit, Any, (Any,), dt)
     Base.Serializer.deserialize_cycle(io, A)

diff --git a/src/array/sort.jl b/src/array/sort.jl
@@ -118,7 +118,7 @@ function transpose_vecvec(xs)
 end
 
 const use_shared_array = Ref(true)
-function _promote_array{T,S}(x::AbstractArray{T}, y::AbstractArray{S})
+function _promote_array(x::AbstractArray{T}, y::AbstractArray{S}) where {T,S}
     Q = promote_type(T,S)
     ok = (isa(x, Array) || isa(x, SharedArray)) && (isa(y, Array) || isa(y, SharedArray))
     if ok && isbits(Q) && use_shared_array[] && Distributed.check_same_host([workers()..., 1])
@@ -133,7 +133,7 @@ function merge_sorted(ord::Ordering, x::AbstractArray, y::AbstractArray)
     _merge_sorted(ord, z, x, y)
 end
 
-function _merge_sorted{T, S}(ord::Ordering, z::AbstractArray{T}, x::AbstractArray{T}, y::AbstractArray{S})
+function _merge_sorted(ord::Ordering, z::AbstractArray{T}, x::AbstractArray{T}, y::AbstractArray{S}) where {T, S}
     n = length(x) + length(y)
     i = 1; j = 1; k = 1
     len_x = length(x)