Merge pull request #22 from yuyichao/0.6

Fix depwarns on 0.6

Author: alsam

REQUIRE

@@ -1 +1,2 @@
 julia 0.5
+Compat 0.18.0

src/OffsetArrays.jl

@@ -5,14 +5,15 @@ module OffsetArrays
 Base.@deprecate_binding (..) Colon()
 
 using Base: Indices, LinearSlow, LinearFast, tail
+using Compat
 
 export OffsetArray, @unsafe
 
 immutable OffsetArray{T,N,AA<:AbstractArray} <: AbstractArray{T,N}
     parent::AA
     offsets::NTuple{N,Int}
 end
-typealias OffsetVector{T,AA<:AbstractArray} OffsetArray{T,1,AA}
+@compat OffsetVector{T,AA<:AbstractArray} = OffsetArray{T,1,AA}
 
 OffsetArray{T,N}(A::AbstractArray{T,N}, offsets::NTuple{N,Int}) =
     OffsetArray{T,N,typeof(A)}(A, offsets)
@@ -200,7 +201,7 @@ end
 @inline unsafe_setindex!(a::OffsetArray, val, I...) = unsafe_setindex!(a, val, Base.IteratorsMD.flatten(I)...)
 
 # Indexing a SubArray which has OffsetArray indices
-typealias OffsetSubArray{T,N,P,I<:Tuple{OffsetArray,Vararg{OffsetArray}}} SubArray{T,N,P,I,false}
+@compat OffsetSubArray{T,N,P,I<:Tuple{OffsetArray,Vararg{OffsetArray}}} = SubArray{T,N,P,I,false}
 @inline function unsafe_getindex{T,N}(a::OffsetSubArray{T,N}, I::Vararg{Int,N})
     J = map(unsafe_getindex, a.indexes, I)
     unsafe_getindex(parent(a), J...)

test/runtests.jl

@@ -1,5 +1,6 @@
 using Base.Test
 using OffsetArrays
+using Compat
 
 ambs = detect_ambiguities(Base, Core)  # in case these have ambiguities of their own
 @test isempty(setdiff(detect_ambiguities(OffsetArrays, Base, Core), ambs))
@@ -128,28 +129,20 @@ for (a,d) in zip(A, A0)
 end
 
 # show
-io = IOBuffer()
-show(io, A)
-str = takebuf_string(io)
-@test str == "[1 3; 2 4]"
-show(io, S)
-str = takebuf_string(io)
-@test str == "[1 3; 2 4]"
-show(io, MIME("text/plain"), A)
-strs = split(strip(takebuf_string(io)), '\n')
+@test sprint(show, A) == "[1 3; 2 4]"
+@test sprint(show, S) == "[1 3; 2 4]"
+strs = split(strip(sprint(show, MIME("text/plain"), A)), '\n')
 @test strs[2] == " 1  3"
 @test strs[3] == " 2  4"
 v = OffsetArray(rand(3), (-2,))
-show(io, v)
-str = takebuf_string(io)
-show(io, parent(v))
-@test str == takebuf_string(io)
+@test sprint(show, v) == sprint(show, parent(v))
+io = IOBuffer()
 function cmp_showf(printfunc, io, A)
     ioc = IOContext(io, limit=true, compact=true)
     printfunc(ioc, A)
-    str1 = takebuf_string(io)
+    str1 = String(take!(io))
     printfunc(ioc, parent(A))
-    str2 = takebuf_string(io)
+    str2 = String(take!(io))
     @test str1 == str2
 end
 cmp_showf(Base.print_matrix, io, OffsetArray(rand(5,5), (10,-9)))       # rows&cols fit