Skip to content

Commit ffd85f2

Browse files
committed
remove typealias deprecation
1 parent 9c4b9cb commit ffd85f2

File tree

2 files changed

+7
-7
lines changed

2 files changed

+7
-7
lines changed

src/darray.jl

Lines changed: 5 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -58,8 +58,8 @@ end
5858
eltype{T}(::Type{DArray{T}}) = T
5959
empty_localpart(T,N,A) = convert(A, Array{T}(ntuple(zero, N)))
6060

61-
typealias SubDArray{T,N,D<:DArray} SubArray{T,N,D}
62-
typealias SubOrDArray{T,N} Union{DArray{T,N}, SubDArray{T,N}}
61+
const SubDArray{T,N,D<:DArray} = SubArray{T,N,D}
62+
const SubOrDArray{T,N} = Union{DArray{T,N}, SubDArray{T,N}}
6363

6464
localtype{T,N,S}(::Type{DArray{T,N,S}}) = S
6565
localtype{T,N,D}(::Type{SubDArray{T,N,D}}) = localtype(D)
@@ -639,9 +639,9 @@ Base.@propagate_inbounds Base.getindex{_,N}(M::MergedIndices{_,N}, I::Vararg{Int
639639
# farther and say that even restricted views of MergedIndices must be valid
640640
# over the entire array. This is overly strict in general, but in this
641641
# use-case all the merged indices must be valid at some point, so it's ok.
642-
typealias ReshapedMergedIndices{T,N,M<:MergedIndices} Base.ReshapedArray{T,N,M}
643-
typealias SubMergedIndices{T,N,M<:Union{MergedIndices, ReshapedMergedIndices}} SubArray{T,N,M}
644-
typealias MergedIndicesOrSub Union{MergedIndices, ReshapedMergedIndices, SubMergedIndices}
642+
const ReshapedMergedIndices{T,N,M<:MergedIndices} = Base.ReshapedArray{T,N,M}
643+
const SubMergedIndices{T,N,M<:Union{MergedIndices, ReshapedMergedIndices}} = SubArray{T,N,M}
644+
const MergedIndicesOrSub = Union{MergedIndices, ReshapedMergedIndices, SubMergedIndices}
645645
import Base: checkbounds_indices
646646
@inline checkbounds_indices(::Type{Bool}, inds::Tuple{}, I::Tuple{MergedIndicesOrSub,Vararg{Any}}) =
647647
checkbounds_indices(Bool, inds, (parent(parent(I[1])).indices..., tail(I)...))

src/linalg.jl

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -14,8 +14,8 @@ function Base.transpose{T}(D::DArray{T,2})
1414
end
1515
end
1616

17-
typealias DVector{T,A} DArray{T,1,A}
18-
typealias DMatrix{T,A} DArray{T,2,A}
17+
const DVector{T,A} = DArray{T,1,A}
18+
const DMatrix{T,A} = DArray{T,2,A}
1919

2020
# Level 1
2121

0 commit comments

Comments
 (0)