Fix #127.

PainterQubits · Apr 19, 2018 · beb7369 · beb7369
1 parent 4489cfb
commit beb7369
Show file tree

Hide file tree

Showing 2 changed files with 7 additions and 1 deletion.
diff --git a/src/promotion.jl b/src/promotion.jl
@@ -106,3 +106,7 @@ Base.promote_rule(::Type{Quantity{T}}, ::Type{Quantity{S,D,U}}) where {T,S,D,U}
 
 Base.promote_rule(::Type{Quantity{S,D,U}}, ::Type{Quantity{T}}) where {T,S,D,U} =
     Quantity{promote_type(T,S)}
+
+@static if VERSION >= v"0.7.0-DEV.3591"
+    Base.promote_typejoin(::Type{T}, ::Type{Quantity{T,D,U}}) where {T,S,D,U} = Quantity{T}
+end
diff --git a/test/runtests.jl b/test/runtests.jl
@@ -1036,7 +1036,9 @@ end
             b = [0.0, 0.0m]
             @test b + b == b
             @test b .+ b == b
-
+            @static if VERSION >= v"0.7.0-DEV.3591"
+                @test eltype(b+b) === Quantity{Float64}
+            end
             # Dimensionless quantities
             @test @inferred([1mm/m] + [1.0cm/m])     == [0.011]
             @test typeof([1mm/m] + [1.0cm/m])        == Array{Float64,1}