Skip to content

Commit a54730b

Browse files
committed
type promotion
1 parent bd4658b commit a54730b

File tree

1 file changed

+4
-1
lines changed

1 file changed

+4
-1
lines changed

src/componentarray.jl

Lines changed: 4 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -361,5 +361,8 @@ ComponentVector{Float64}(a = 1.2, h = 4.0, b = 2.3)
361361
```
362362
"""
363363
Base.merge(ca::ComponentVector) = ca
364-
Base.merge(ca1::ComponentVector, ca2::ComponentVector) = ComponentVector(ca1; ca2...)
364+
function Base.merge(ca1::ComponentVector{T1}, ca2::ComponentVector{T2}) where {T1, T2}
365+
promoted_ca1 = ComponentVector{promot_type(T1, T2)}(ca1)
366+
ComponentVector(ca1; ca2...)
367+
end
365368
Base.merge(ca1::ComponentVector, ca2::ComponentVector, cs::ComponentVector) = merge(merge(ca1,ca2), others...)

0 commit comments

Comments
 (0)