Skip to content

Commit f949df1

Browse files
committed
fixed promotion
1 parent a54730b commit f949df1

File tree

1 file changed

+1
-1
lines changed

1 file changed

+1
-1
lines changed

src/componentarray.jl

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -363,6 +363,6 @@ ComponentVector{Float64}(a = 1.2, h = 4.0, b = 2.3)
363363
Base.merge(ca::ComponentVector) = ca
364364
function Base.merge(ca1::ComponentVector{T1}, ca2::ComponentVector{T2}) where {T1, T2}
365365
promoted_ca1 = ComponentVector{promot_type(T1, T2)}(ca1)
366-
ComponentVector(ca1; ca2...)
366+
ComponentVector(promoted_ca1; ca2...)
367367
end
368368
Base.merge(ca1::ComponentVector, ca2::ComponentVector, cs::ComponentVector) = merge(merge(ca1,ca2), others...)

0 commit comments

Comments
 (0)