Merge 3c11a0a into b974c39

JuliaData · Feb 18, 2017 · cf3aa68 · cf3aa68
2 parents b974c39 + 3c11a0a
commit cf3aa68
Show file tree

Hide file tree

Showing 2 changed files with 2 additions and 2 deletions.
diff --git a/REQUIRE b/REQUIRE
@@ -1,3 +1,3 @@
 julia 0.5.0
-Compat 0.18.0
+Compat 0.19.0
 NullableArrays
diff --git a/src/array.jl b/src/array.jl
@@ -317,7 +317,7 @@ function @compat(Base.:(==))(A::CatArray, B::CatArray)
 end
 
 size(A::CatArray) = size(A.refs)
-linearindexing{T <: CatArray}(::Type{T}) = Base.LinearFast()
+@compat Base.IndexStyle(::Type{<:CatArray}) = IndexLinear()
 
 @inline function setindex!(A::CatArray, v::Any, I::Real...)
     @boundscheck checkbounds(A, I...)