Skip to content

Commit b0ee8f1

Browse files
authored
Merge pull request #2 from JuliaArrays/teh/IndexStyle
Fix IndexStyle depwarns on 0.6
2 parents 5307f46 + 782914f commit b0ee8f1

File tree

4 files changed

+5
-2
lines changed

4 files changed

+5
-2
lines changed

REQUIRE

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -1 +1,2 @@
11
julia 0.4
2+
Compat 0.19

src/RangeArrays.jl

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,7 @@
11
module RangeArrays
22

3+
using Compat
4+
35
include("matrix.jl")
46
include("repeatedrange.jl")
57

src/matrix.jl

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -24,7 +24,7 @@ function RangeMatrix{T<:Range}(rs::AbstractVector{T})
2424
end
2525

2626
Base.size(R::RangeMatrix) = R.dims
27-
Base.linearindexing{R<:RangeMatrix}(::Type{R}) = Base.LinearSlow()
27+
@compat Base.IndexStyle(::Type{<:RangeMatrix}) = IndexCartesian()
2828

2929
# Scalar indexing
3030
Base.getindex(R::RangeMatrix, i::Int, j::Int) = (checkbounds(R, i, j); Base.unsafe_getindex(R, i, j))

src/repeatedrange.jl

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -12,7 +12,7 @@ end
1212
RepeatedRangeMatrix{T}(r::Range{T}, at::AbstractVector{T}) = RepeatedRangeMatrix{T, typeof(r), typeof(at)}(r, at)
1313

1414
Base.size(R::RepeatedRangeMatrix) = (length(R.r), length(R.at))
15-
Base.linearindexing{R<:RepeatedRangeMatrix}(::Type{R}) = Base.LinearSlow()
15+
@compat Base.IndexStyle(::Type{<:RepeatedRangeMatrix}) = IndexCartesian()
1616

1717
# Scalar indexing
1818
Base.getindex(R::RepeatedRangeMatrix, i::Int, j::Int) = (checkbounds(R, i, j); Base.unsafe_getindex(R, i, j))

0 commit comments

Comments
 (0)