Skip to content

Commit

Permalink
Fix missing renames
Browse files Browse the repository at this point in the history
  • Loading branch information
tknopp committed Aug 21, 2014
1 parent 422d234 commit 124ad0e
Show file tree
Hide file tree
Showing 3 changed files with 4 additions and 4 deletions.
4 changes: 2 additions & 2 deletions base/abstractarray.jl
Original file line number Diff line number Diff line change
Expand Up @@ -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)
Expand Down
2 changes: 1 addition & 1 deletion base/hashing2.jl
Original file line number Diff line number Diff line change
Expand Up @@ -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)
Expand Down
2 changes: 1 addition & 1 deletion base/printf.jl
Original file line number Diff line number Diff line change
Expand Up @@ -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 = {}
Expand Down

0 comments on commit 124ad0e

Please sign in to comment.