Skip to content

Commit 491f602

Browse files
committed
Correctly find size of non-homogenous tuples in broadcast_size
Fixes #841
1 parent b6f58ad commit 491f602

File tree

2 files changed

+4
-1
lines changed

2 files changed

+4
-1
lines changed

src/broadcast.jl

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -55,7 +55,7 @@ broadcast_indices(A::StaticArray) = indices(A)
5555
@inline broadcast_sizes() = ()
5656
@inline broadcast_size(a) = Size()
5757
@inline broadcast_size(a::AbstractArray) = Size(a)
58-
@inline broadcast_size(a::NTuple{N}) where N = Size(N)
58+
@inline broadcast_size(a::Tuple) = Size(length(a))
5959

6060
function broadcasted_index(oldsize, newindex)
6161
index = ones(Int, length(oldsize))

test/broadcast.jl

Lines changed: 3 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -26,6 +26,9 @@ end
2626
end
2727
# test case issue #191
2828
@test @inferred(broadcast((a, b, c) -> 0, SVector(1, 1), 0, 0)) == SVector(0, 0)
29+
30+
# test case issue #841
31+
@test @inferred(StaticArrays.broadcast_size((1, 2.0))) === Size(2)
2932
end
3033

3134
@testset "Broadcast" begin

0 commit comments

Comments
 (0)