Merge pull request #130 from JuliaParallel/vc/0.6

Miscellaneous fixes for Julia v0.6

Author: vchuravy

.travis.yml

@@ -3,6 +3,7 @@ os:
   - linux
   - osx
 julia:
+  - 0.6
   - nightly
 matrix:
   # allow_failures:

src/darray.jl

@@ -32,7 +32,7 @@ type DArray{T,N,A} <: AbstractArray{T,N}
 
     release::Bool
 
-    function DArray(id, dims, pids, indexes, cuts, lp)
+    function DArray{T,N,A}(id, dims, pids, indexes, cuts, lp) where {T,N,A}
         # check invariants
         if dims != map(last, last(indexes))
             throw(ArgumentError("dimension of DArray (dim) and indexes do not match"))
@@ -52,14 +52,14 @@ type DArray{T,N,A} <: AbstractArray{T,N}
         d
     end
 
-    DArray() = new()
+    DArray{T,N,A}() where {T,N,A} = new()
 end
 
 eltype{T}(::Type{DArray{T}}) = T
 empty_localpart(T,N,A) = convert(A, Array{T}(ntuple(zero, N)))
 
-typealias SubDArray{T,N,D<:DArray} SubArray{T,N,D}
-typealias SubOrDArray{T,N} Union{DArray{T,N}, SubDArray{T,N}}
+const SubDArray{T,N,D<:DArray} = SubArray{T,N,D}
+const SubOrDArray{T,N} = Union{DArray{T,N}, SubDArray{T,N}}
 
 localtype{T,N,S}(::Type{DArray{T,N,S}}) = S
 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
 # farther and say that even restricted views of MergedIndices must be valid
 # over the entire array. This is overly strict in general, but in this
 # use-case all the merged indices must be valid at some point, so it's ok.
-typealias ReshapedMergedIndices{T,N,M<:MergedIndices} Base.ReshapedArray{T,N,M}
-typealias SubMergedIndices{T,N,M<:Union{MergedIndices, ReshapedMergedIndices}} SubArray{T,N,M}
-typealias MergedIndicesOrSub Union{MergedIndices, ReshapedMergedIndices, SubMergedIndices}
+const ReshapedMergedIndices{T,N,M<:MergedIndices} = Base.ReshapedArray{T,N,M}
+const SubMergedIndices{T,N,M<:Union{MergedIndices, ReshapedMergedIndices}} = SubArray{T,N,M}
+const MergedIndicesOrSub = Union{MergedIndices, ReshapedMergedIndices, SubMergedIndices}
 import Base: checkbounds_indices
 @inline checkbounds_indices(::Type{Bool}, inds::Tuple{}, I::Tuple{MergedIndicesOrSub,Vararg{Any}}) =
     checkbounds_indices(Bool, inds, (parent(parent(I[1])).indices..., tail(I)...))

src/linalg.jl

@@ -14,8 +14,8 @@ function Base.transpose{T}(D::DArray{T,2})
     end
 end
 
-typealias DVector{T,A} DArray{T,1,A}
-typealias DMatrix{T,A} DArray{T,2,A}
+const DVector{T,A} = DArray{T,1,A}
+const DMatrix{T,A} = DArray{T,2,A}
 
 # Level 1
 

test/REQUIRE

@@ -0,0 +1 @@
+SpecialFunctions

test/darray.jl

@@ -1,3 +1,5 @@
+using SpecialFunctions
+
 @testset "test distribute" begin
     A = rand(1:100, (100,100))