diff --git a/base/abstractarray.jl b/base/abstractarray.jl index cdfa0abe14e6c2..1163e0c3994b97 100644 --- a/base/abstractarray.jl +++ b/base/abstractarray.jl @@ -320,8 +320,8 @@ end float{T<:FloatingPoint}(x::AbstractArray{T}) = x complex{T<:Complex}(x::AbstractArray{T}) = x -float{T<:Integer64}(x::AbstractArray{T}) = convert(AbstractArray{typeof(float(zero(T)))}, x) -complex{T<:Union(Integer64,Float64,Float32,Float16)}(x::AbstractArray{T}) = +float{T<:IntegerUpto64}(x::AbstractArray{T}) = convert(AbstractArray{typeof(float(zero(T)))}, x) +complex{T<:Union(IntegerUpto64,Float64,Float32,Float16)}(x::AbstractArray{T}) = convert(AbstractArray{typeof(complex(zero(T)))}, x) function float(A::AbstractArray) diff --git a/base/hashing2.jl b/base/hashing2.jl index 342e2dc6c8a934..7d640a885307bc 100644 --- a/base/hashing2.jl +++ b/base/hashing2.jl @@ -129,7 +129,7 @@ end ## streamlined hashing for smallish rational types ## -function hash{T<:Integer64}(x::Rational{T}, h::Uint) +function hash{T<:IntegerUpto64}(x::Rational{T}, h::Uint) num, den = Base.num(x), Base.den(x) den == 1 && return hash(num, h) den == 0 && return hash(ifelse(num > 0, Inf, -Inf), h) diff --git a/base/printf.jl b/base/printf.jl index b19483795714b6..27d823ac5fbdea 100644 --- a/base/printf.jl +++ b/base/printf.jl @@ -4,7 +4,7 @@ export @printf, @sprintf ### printf formatter generation ### const SmallFloatingPoint = Union(Float64,Float32,Float16) -const SmallNumber = Union(SmallFloatingPoint,Base.Signed64,Base.Unsigned64,Uint128,Int128) +const SmallNumber = Union(SmallFloatingPoint,Base.SignedUpto128,Base.UnsignedUpto128) function gen(s::String) args = {}