avoid 4-arg promote_type

Base can't infer it
PainterQubits · Jun 6, 2017 · 60367b1 · 60367b1
1 parent 1164e20
commit 60367b1
Showing 1 changed file with 1 addition and 1 deletion.
diff --git a/src/Promotion.jl b/src/Promotion.jl
@@ -161,7 +161,7 @@ function Base.promote_rule{S1,S2,D,U1,U2}(::Type{Quantity{S1,D,U1}},
 
     p = promote_unit(U1(), U2())
     numtype = promote_type(S1,S2,
-        typeof(convfact(p,U1())), typeof(convfact(p,U2())))
+        promote_type(typeof(convfact(p,U1())), typeof(convfact(p,U2()))))
     if !isunitless(p)
         if U1 <: ContextUnits && U2 <: ContextUnits
             up1 = upreferred(U1())