Fix ambiguities introduced in BlockArrays v1.7 (#203)

Author: dlfivefifty

Project.toml

@@ -1,6 +1,6 @@
 name = "ContinuumArrays"
 uuid = "7ae1f121-cc2c-504b-ac30-9b923412ae5c"
-version = "0.19.2"
+version = "0.19.3"
 
 [deps]
 AbstractFFTs = "621f4979-c628-5d54-868e-fcf4e3e8185c"
@@ -29,7 +29,7 @@ ContinuumArraysRecipesBaseExt = "RecipesBase"
 AbstractFFTs = "1.0"
 ArrayLayouts = "1.0"
 BandedMatrices = "1"
-BlockArrays = "1.4"
+BlockArrays = "1.7"
 DomainSets = "0.6, 0.7"
 FastTransforms = "0.15, 0.16, 0.17"
 FillArrays = "1.0"

src/ContinuumArrays.jl

@@ -80,14 +80,14 @@ end
 
 @inline to_indices(A::AbstractQuasiArray, inds, I::Tuple{Block{1}, Vararg{Any}}) =
     (unblock(A, inds, I), to_indices(A, _cutdim(inds, I[1]), tail(I))...)
-@inline to_indices(A::AbstractQuasiArray, inds, I::Tuple{BlockRange{1,R}, Vararg{Any}}) where R =
+@inline to_indices(A::AbstractQuasiArray, inds, I::Tuple{BlockRange{1}, Vararg{Any}}) =
     (unblock(A, inds, I), to_indices(A, _cutdim(inds, I[1]), tail(I))...)
 @inline to_indices(A::AbstractQuasiArray, inds, I::Tuple{BlockIndex{1}, Vararg{Any}}) =
     (inds[1][I[1]], to_indices(A, _cutdim(inds, I[1]), tail(I))...)
 @inline to_indices(A::AbstractQuasiArray, I::Tuple{BlockRange, Vararg{Any}}) = to_indices(A, axes(A), I)
-@inline to_indices(A::AbstractQuasiArray, inds, I::Tuple{AbstractVector{Block{1,R}}, Vararg{Any}}) where R =
+@inline to_indices(A::AbstractQuasiArray, inds, I::Tuple{AbstractVector{<:Block{1}}, Vararg{Any}}) =
     (unblock(A, inds, I), to_indices(A, _maybetail(inds), tail(I))...)
-@inline to_indices(A::AbstractQuasiArray, inds, I::Tuple{BlockIndexRange{1,R}, Vararg{Any}}) where R =
+@inline to_indices(A::AbstractQuasiArray, inds, I::Tuple{BlockIndexRange{1}, Vararg{Any}}) =
     (unblock(A, inds, I), to_indices(A, _maybetail(inds), tail(I))...)
 @inline to_indices(A::AbstractQuasiArray, inds, I::Tuple{AbstractVector{<:BlockIndex{1}}, Vararg{Any}}) =
     (inds[1][I[1]], to_indices(A, _cutdim(inds, I[1]), tail(I))...)