Skip to content

Commit

Permalink
Merge pull request #5895 from JuliaLang/cjh/fix-5891
Browse files Browse the repository at this point in the history
Rename pididx -> pidx in SharedArray code.
  • Loading branch information
amitmurthy committed Feb 22, 2014
2 parents b2fea25 + 77eaa66 commit 0b2d867
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 @@ -112,7 +112,7 @@ length(S::SharedArray) = prod(S.dims)
size(S::SharedArray) = S.dims

procs(S::SharedArray) = S.pids
indexpids(S::SharedArray) = S.pididx
indexpids(S::SharedArray) = S.pidx

sdata(S::SharedArray) = S.s
sdata(A::AbstractArray) = A
Expand Down Expand Up @@ -151,7 +151,7 @@ end


# Don't serialize s (it is the complete array) and
# pididx, which is relevant to the current process only
# pidx, which is relevant to the current process only
function serialize(s, S::SharedArray)
serialize_type(s, typeof(S))
serialize(s, length(SharedArray.names))
Expand Down

0 comments on commit 0b2d867

Please sign in to comment.