Skip to content

Commit 3d86ace

Browse files
authored
Merge pull request #81 from JuliaMath/teh/rem_ambig
Resolve new `rem` ambiguity on 0.6
2 parents f393589 + c57986c commit 3d86ace

1 file changed

Lines changed: 1 addition & 0 deletions

File tree

src/normed.jl

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -56,6 +56,7 @@ end
5656

5757
rem{T<:Normed}(x::T, ::Type{T}) = x
5858
@inline rem{T<:Normed}(x::Normed, ::Type{T}) = reinterpret(T, _unsafe_trunc(rawtype(T), round((rawone(T)/rawone(x))*reinterpret(x))))
59+
@inline rem{T<:Normed}(x::Integer, ::Type{T}) = reinterpret(T, _unsafe_trunc(rawtype(T), round(rawone(T)*x)))
5960
@inline rem{T<:Normed}(x::Real, ::Type{T}) = reinterpret(T, _unsafe_trunc(rawtype(T), round(rawone(T)*x)))
6061

6162
# convert(::Type{AbstractFloat}, x::Normed) = convert(floattype(x), x)

0 commit comments

Comments
 (0)