Merge branch 'master' of github.com:JuliaLang/julia

JuliaLang · Apr 20, 2014 · eeb41fc · eeb41fc
2 parents ada8099 + 92a531e
commit eeb41fc
Showing 1 changed file with 2 additions and 3 deletions.
diff --git a/base/array.jl b/base/array.jl
@@ -678,10 +678,9 @@ end
 ## Binary arithmetic operators ##
 
 promote_array_type{Scalar, Arry}(::Type{Scalar}, ::Type{Arry}) = promote_type(Scalar, Arry)
-promote_array_type{S<:Real, A<:Real}(::Type{S}, ::Type{A}) = A
-promote_array_type{S<:Complex, A<:Complex}(::Type{S}, ::Type{A}) = A
+promote_array_type{S<:Real, A<:FloatingPoint}(::Type{S}, ::Type{A}) = A
+promote_array_type{S<:Union(Complex, Real), AT<:FloatingPoint}(::Type{S}, ::Type{Complex{AT}}) = Complex{AT}
 promote_array_type{S<:Integer, A<:Integer}(::Type{S}, ::Type{A}) = A
-promote_array_type{S<:Real, A<:Integer}(::Type{S}, ::Type{A}) = promote_type(S, A)
 promote_array_type{S<:Integer}(::Type{S}, ::Type{Bool}) = S
 
 ./{T<:Integer}(x::Integer, y::StridedArray{T}) =