Skip to content

Commit e57195d

Browse files
authored
Merge pull request #46 from yuyichao/0.6-dep
Fix vectorize function depwarn on 0.6
2 parents 82f28bf + f1a25ad commit e57195d

4 files changed

Lines changed: 13 additions & 8 deletions

File tree

.travis.yml

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -4,6 +4,7 @@ os:
44
- osx
55
julia:
66
- 0.4
7+
- 0.5
78
- nightly
89
notifications:
910
email: false

REQUIRE

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,2 +1,2 @@
11
julia 0.4
2-
Compat 0.7.14
2+
Compat 0.9.1

src/ufixed.jl

Lines changed: 5 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -51,11 +51,11 @@ ufixed12(x) = convert(UFixed12, x)
5151
ufixed14(x) = convert(UFixed14, x)
5252
ufixed16(x) = convert(UFixed16, x)
5353

54-
@vectorize_1arg Real ufixed8
55-
@vectorize_1arg Real ufixed10
56-
@vectorize_1arg Real ufixed12
57-
@vectorize_1arg Real ufixed14
58-
@vectorize_1arg Real ufixed16
54+
Compat.@dep_vectorize_1arg Real ufixed8
55+
Compat.@dep_vectorize_1arg Real ufixed10
56+
Compat.@dep_vectorize_1arg Real ufixed12
57+
Compat.@dep_vectorize_1arg Real ufixed14
58+
Compat.@dep_vectorize_1arg Real ufixed16
5959

6060

6161
convert(::Type{BigFloat}, x::UFixed) = reinterpret(x)*(1/BigFloat(rawone(x)))

test/ufixed.jl

Lines changed: 6 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,6 @@
1-
using FixedPointNumbers, Base.Test
1+
using FixedPointNumbers
2+
using Base.Test
3+
using Compat
24

35
@test reinterpret(0xa2uf8) == 0xa2
46
@test reinterpret(0xa2uf10) == 0xa2
@@ -15,7 +17,9 @@ using FixedPointNumbers, Base.Test
1517
@test ufixed8(1.0) == 0xffuf8
1618
@test ufixed8(0.5) == 0x80uf8
1719
@test ufixed14(1.0) == 0x3fffuf14
18-
@test ufixed12([2]) == UFixed12[0x1ffeuf12]
20+
v = @compat ufixed12.([2])
21+
@test v == UFixed12[0x1ffeuf12]
22+
@test isa(v, Vector{UFixed12})
1923

2024
UF2 = (UFixed{UInt32,16}, UFixed{UInt64,3}, UFixed{UInt128,7})
2125

0 commit comments

Comments
 (0)