Skip to content

Commit 9a1b40a

Browse files
authored
Merge pull request #72 from yuyichao/yyc/0.6
Fix depwarns on 0.6, remove a few defs for 0.4
2 parents 14b1f33 + 01b7802 commit 9a1b40a

3 files changed

Lines changed: 11 additions & 14 deletions

File tree

src/FixedPointNumbers.jl

Lines changed: 7 additions & 9 deletions
Original file line numberDiff line numberDiff line change
@@ -9,19 +9,14 @@ import Base: ==, <, <=, -, +, *, /, ~, isapprox,
99
isnan, isinf, isfinite,
1010
zero, one, typemin, typemax, realmin, realmax, eps, sizeof, reinterpret,
1111
float, trunc, round, floor, ceil, bswap,
12-
div, fld, rem, mod, mod1, rem1, fld1, min, max, minmax,
12+
div, fld, rem, mod, mod1, fld1, min, max, minmax,
1313
start, next, done, r_promote, reducedim_init, rand
14-
15-
if VERSION <= v"0.5.0-dev+755"
16-
macro pure(ex)
17-
nothing
18-
end
19-
else
20-
using Base: @pure
14+
if isdefined(Base, :rem1)
15+
import Base: rem1
2116
end
17+
using Base: @pure
2218

2319
using Compat
24-
import Compat.String
2520

2621
# T => BaseType
2722
# f => Number of Bytes reserved for fractional part
@@ -141,6 +136,9 @@ for f in (:div, :fld, :fld1)
141136
end
142137
end
143138
for f in (:rem, :mod, :mod1, :rem1, :min, :max)
139+
if f === :rem1 && !isdefined(Base, :rem1)
140+
continue
141+
end
144142
@eval begin
145143
$f{T<:FixedPoint}(x::T, y::T) = T($f(reinterpret(x),reinterpret(y)),0)
146144
end

src/fixed.jl

Lines changed: 2 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -4,9 +4,8 @@ immutable Fixed{T <: Signed,f} <: FixedPoint{T, f}
44

55
# constructor for manipulating the representation;
66
# selected by passing an extra dummy argument
7-
Fixed(i::Integer,_) = new(i % T)
8-
9-
Fixed(x) = convert(Fixed{T,f}, x)
7+
(::Type{Fixed{T, f}}){T, f}(i::Integer, _) = new{T, f}(i % T)
8+
(::Type{Fixed{T, f}}){T, f}(x) = convert(Fixed{T,f}, x)
109
end
1110

1211
reinterpret{T<:Signed, f}(::Type{Fixed{T,f}}, x::T) = Fixed{T,f}(x, 0)

src/normed.jl

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -4,8 +4,8 @@
44
immutable Normed{T<:Unsigned,f} <: FixedPoint{T,f}
55
i::T
66

7-
Normed(i::Integer,_) = new(i%T) # for setting by raw representation
8-
Normed(x) = convert(Normed{T,f}, x)
7+
(::Type{Normed{T, f}}){T, f}(i::Integer,_) = new{T, f}(i%T) # for setting by raw representation
8+
(::Type{Normed{T, f}}){T, f}(x) = convert(Normed{T,f}, x)
99
end
1010

1111
rawtype{T,f}(::Type{Normed{T,f}}) = T

0 commit comments

Comments
 (0)