Skip to content

Commit 99d1530

Browse files
authored
Support Julia v1.5 (#129)
* Support Julia v1.5 * add elsize * v0.12.12 * Revert "v0.12.12" This reverts commit 5790b31.
1 parent abf38ef commit 99d1530

File tree

4 files changed

+7
-4
lines changed

4 files changed

+7
-4
lines changed

.travis.yml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -5,7 +5,7 @@ os:
55
- osx
66
julia:
77
- 1.1
8-
- 1.4
8+
- 1.5
99
- nightly
1010
matrix:
1111
allow_failures:

Project.toml

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,14 +1,14 @@
11
name = "BlockArrays"
22
uuid = "8e7c35d0-a365-5155-bbbb-fb81a777f24e"
3-
version = "0.12.10"
3+
version = "0.12.11"
44

55
[deps]
66
ArrayLayouts = "4c555306-a7a7-4459-81d9-ec55ddd5c99a"
77
Compat = "34da2185-b29b-5c13-b0c7-acf172513d20"
88
LinearAlgebra = "37e2e46d-f89d-539d-b4ee-838fcccc9c8e"
99

1010
[compat]
11-
ArrayLayouts = "0.3.4"
11+
ArrayLayouts = "0.3.8"
1212
Compat = "2.2, 3"
1313
julia = "1.1"
1414

src/blockarray.jl

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -358,7 +358,7 @@ end
358358
@inline Base.similar(block_array::Type{<:AbstractArray{T}}, axes::Tuple{AbstractUnitRange{Int},BlockedUnitRange,Vararg{AbstractUnitRange{Int}}}) where T =
359359
BlockArray{T}(undef, axes)
360360

361-
const OffsetAxis = Union{Integer, UnitRange, Base.OneTo, Base.IdentityUnitRange, Colon}
361+
const OffsetAxis = Union{Integer, UnitRange, Base.OneTo, Base.IdentityUnitRange}
362362

363363
# avoid ambiguities
364364
@inline Base.similar(block_array::BlockArray, ::Type{T}, dims::NTuple{N,Int}) where {T,N} =

src/pseudo_blockarray.jl

Lines changed: 3 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -322,6 +322,9 @@ Base.strides(A::PseudoBlockArray) = strides(A.blocks)
322322
Base.stride(A::PseudoBlockArray, i::Integer) = stride(A.blocks, i)
323323
Base.unsafe_convert(::Type{Ptr{T}}, A::PseudoBlockArray) where T = Base.unsafe_convert(Ptr{T}, A.blocks)
324324

325+
if VERSION  v"1.5"
326+
Base.elsize(::Type{<:PseudoBlockArray{T}}) where {T} = Base.aligned_sizeof(T)
327+
end
325328

326329
###
327330
# col/rowsupport

0 commit comments

Comments
 (0)