Skip to content

Commit

Permalink
Fix ambiguity warnings with SharedArray
Browse files Browse the repository at this point in the history
As reported and discussed here:
JuliaLang#8432 (comment)
  • Loading branch information
Jutho committed Nov 17, 2014
1 parent 1f9a5f0 commit 1c12bcb
Showing 1 changed file with 2 additions and 2 deletions.
4 changes: 2 additions & 2 deletions base/sharedarray.jl
Original file line number Diff line number Diff line change
Expand Up @@ -210,12 +210,12 @@ convert(::Type{Array}, S::SharedArray) = S.s
getindex(S::SharedArray) = getindex(S.s)
getindex(S::SharedArray, I::Real) = getindex(S.s, I)
getindex(S::SharedArray, I::AbstractArray) = getindex(S.s, I)
@nsplat N 1:5 getindex(S::SharedArray, I::NTuple{N,Any}...) = getindex(S.s, I...)
@nsplat N 1:5 getindex(S::SharedArray, I::NTuple{N,Union(Real,AbstractVector)}...) = getindex(S.s, I...)

setindex!(S::SharedArray, x) = setindex!(S.s, x)
setindex!(S::SharedArray, x, I::Real) = setindex!(S.s, x, I)
setindex!(S::SharedArray, x, I::AbstractArray) = setindex!(S.s, x, I)
@nsplat N 1:5 setindex!(S::SharedArray, x, I::NTuple{N,Any}...) = setindex!(S.s, x, I...)
@nsplat N 1:5 setindex!(S::SharedArray, x, I::NTuple{N,Union(Real,AbstractVector)}...) = setindex!(S.s, x, I...)

function fill!(S::SharedArray, v)
f = S->fill!(S.loc_subarr_1d, v)
Expand Down

0 comments on commit 1c12bcb

Please sign in to comment.