Skip to content

Commit 69e4a03

Browse files
authored
Fix an ambiguity on nightly (#88)
1 parent d50463f commit 69e4a03

File tree

2 files changed

+8
-7
lines changed

2 files changed

+8
-7
lines changed

Project.toml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
11
name = "OffsetArrays"
22
uuid = "6fe1bfb0-de20-5000-8ca7-80f57d26f881"
3-
version = "0.11.2"
3+
version = "0.11.3"
44

55
[compat]
66
julia = "0.7, 1"

src/OffsetArrays.jl

Lines changed: 7 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -112,6 +112,7 @@ Base.reshape(A::OffsetArray, inds::Tuple{OffsetAxis,Vararg{OffsetAxis}}) =
112112
# And for non-offset axes, we can just return a reshape of the parent directly
113113
Base.reshape(A::OffsetArray, inds::Tuple{Union{Integer,Base.OneTo},Vararg{Union{Integer,Base.OneTo}}}) = reshape(parent(A), inds)
114114
Base.reshape(A::OffsetArray, inds::Dims) = reshape(parent(A), inds)
115+
Base.reshape(A::OffsetArray, ::Colon) = A
115116
Base.reshape(A::OffsetArray, inds::Union{Int,Colon}...) = reshape(parent(A), inds)
116117
Base.reshape(A::OffsetArray, inds::Tuple{Vararg{Union{Int,Colon}}}) = reshape(parent(A), inds)
117118

@@ -333,19 +334,19 @@ end
333334

334335
if VERSION  v"1.2"
335336
# ambiguity warnings in earlier versions
336-
Base.searchsorted(v::OffsetArray, x, ilo::Int, ihi::Int, o::Base.Ordering) =
337+
Base.searchsorted(v::OffsetArray, x, ilo::Int, ihi::Int, o::Base.Ordering) =
337338
_safe_searchsorted(v, x, ilo, ihi, o)
338-
Base.searchsortedfirst(v::OffsetArray, x, lo::Int, hi::Int, o::Base.Ordering) =
339+
Base.searchsortedfirst(v::OffsetArray, x, lo::Int, hi::Int, o::Base.Ordering) =
339340
_safe_searchsortedfirst(v, x, lo, hi, o)
340-
Base.searchsortedlast(v::OffsetArray, x, lo::Int, hi::Int, o::Base.Ordering) =
341+
Base.searchsortedlast(v::OffsetArray, x, lo::Int, hi::Int, o::Base.Ordering) =
341342
_safe_searchsortedlast(v, x, lo, hi, o)
342343
end
343344

344-
Base.searchsorted(v::OffsetArray, x, ilo::T, ihi::T, o::Base.Ordering) where T<:Integer =
345+
Base.searchsorted(v::OffsetArray, x, ilo::T, ihi::T, o::Base.Ordering) where T<:Integer =
345346
_safe_searchsorted(v, x, ilo, ihi, o)
346-
Base.searchsortedfirst(v::OffsetArray, x, lo::T, hi::T, o::Base.Ordering) where T<:Integer =
347+
Base.searchsortedfirst(v::OffsetArray, x, lo::T, hi::T, o::Base.Ordering) where T<:Integer =
347348
_safe_searchsortedfirst(v, x, lo, hi, o)
348-
Base.searchsortedlast(v::OffsetArray, x, lo::T, hi::T, o::Base.Ordering) where T<:Integer =
349+
Base.searchsortedlast(v::OffsetArray, x, lo::T, hi::T, o::Base.Ordering) where T<:Integer =
349350
_safe_searchsortedlast(v, x, lo, hi, o)
350351

351352

0 commit comments

Comments
 (0)