Skip to content

Commit 1c12bcb

Browse files
committedNov 17, 2014
Fix ambiguity warnings with SharedArray
As reported and discussed here: #8432 (comment)
1 parent 1f9a5f0 commit 1c12bcb

File tree

1 file changed

+2
-2
lines changed

1 file changed

+2
-2
lines changed
 

‎base/sharedarray.jl

+2-2
Original file line numberDiff line numberDiff line change
@@ -210,12 +210,12 @@ convert(::Type{Array}, S::SharedArray) = S.s
210210
getindex(S::SharedArray) = getindex(S.s)
211211
getindex(S::SharedArray, I::Real) = getindex(S.s, I)
212212
getindex(S::SharedArray, I::AbstractArray) = getindex(S.s, I)
213-
@nsplat N 1:5 getindex(S::SharedArray, I::NTuple{N,Any}...) = getindex(S.s, I...)
213+
@nsplat N 1:5 getindex(S::SharedArray, I::NTuple{N,Union(Real,AbstractVector)}...) = getindex(S.s, I...)
214214

215215
setindex!(S::SharedArray, x) = setindex!(S.s, x)
216216
setindex!(S::SharedArray, x, I::Real) = setindex!(S.s, x, I)
217217
setindex!(S::SharedArray, x, I::AbstractArray) = setindex!(S.s, x, I)
218-
@nsplat N 1:5 setindex!(S::SharedArray, x, I::NTuple{N,Any}...) = setindex!(S.s, x, I...)
218+
@nsplat N 1:5 setindex!(S::SharedArray, x, I::NTuple{N,Union(Real,AbstractVector)}...) = setindex!(S.s, x, I...)
219219

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

0 commit comments

Comments
 (0)
Please sign in to comment.