Merge pull request #89 from vtjnash/patch-1

avoid dependency on promote being marked pure
PainterQubits · Jun 6, 2017 · ef27338 · ef27338
2 parents 1164e20 + 9a8dd68
commit ef27338
Show file tree

Hide file tree

Showing 2 changed files with 3 additions and 2 deletions.
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())

diff --git a/src/Unitful.jl b/src/Unitful.jl
@@ -44,7 +44,8 @@ const promotion = Dict{Symbol,Unit}()
 include("User.jl")
 const NoUnits = FreeUnits{(), Dimensions{()}}()
 const NoDims = Dimensions{()}()
-@inline isunitless{N}(::Units{N}) = N == ()
+isunitless(::Units) = false
+isunitless(::Units{()}) = true
 
 (y::FreeUnits)(x::Number) = uconvert(y,x)
 (y::ContextUnits)(x::Number) = uconvert(y,x)