Fix depwarns on 0.7 (#57)

JuliaMath · Sep 13, 2017 · acc31a4 · acc31a4
1 parent 2267021
commit acc31a4
Show file tree

Hide file tree

Showing 3 changed files with 12 additions and 7 deletions.
diff --git a/REQUIRE b/REQUIRE
@@ -1,2 +1,2 @@
 julia 0.5
-Compat 0.18.0
+Compat 0.30.0
diff --git a/src/Primes.jl b/src/Primes.jl
@@ -178,7 +178,10 @@ julia> isprime(big(3))
 true
 ```
 """
-isprime(x::BigInt, reps=25) = ccall((:__gmpz_probab_prime_p,:libgmp), Cint, (Ptr{BigInt}, Cint), &x, reps) > 0
+isprime(x::BigInt, reps=25) = ccall((:__gmpz_probab_prime_p,:libgmp),
+                                    Cint, (Any, Cint), x, reps) > 0
+# TODO: Change `Any` to `Ref{BigInt}` when 0.6 support is dropped.
+# The two have the same effect but `Ref{BigInt}` won't be optimized on 0.6.
 
 
 # Miller-Rabin witness choices based on:
@@ -535,10 +538,12 @@ end
 
 # modify a BigInt in-place
 function add_!(n::BigInt, x::Int)
+    # TODO: Change `Any` to `Ref{BigInt}` when 0.6 support is dropped.
+    # The two have the same effect but `Ref{BigInt}` won't be optimized on 0.6.
     if x < 0
-        ccall((:__gmpz_sub_ui, :libgmp), Void, (Ptr{BigInt}, Ptr{BigInt}, Culong), &n, &n, -x)
+        ccall((:__gmpz_sub_ui, :libgmp), Void, (Any, Any, Culong), n, n, -x)
     else
-        ccall((:__gmpz_add_ui, :libgmp), Void, (Ptr{BigInt}, Ptr{BigInt}, Culong), &n, &n, x)
+        ccall((:__gmpz_add_ui, :libgmp), Void, (Any, Any, Culong), n, n, x)
     end
     n
 end
@@ -571,7 +576,7 @@ julia> nextprime(5, 2)
 """
 function nextprime(n::Integer, i::Integer=1)
     i < 0 && return prevprime(n, -i)
-    i == 0 && throw(DomainError())
+    i == 0 && throw(DomainError(i))
     n < 2 && (n = oftype(n, 2))
     if n == 2
         if i <= 1
@@ -646,7 +651,7 @@ julia> prime(3)
 
 ```
 """
-prime{T<:Integer}(::Type{T}, i::Integer) = i < 0 ? throw(DomainError()) : nextprime(T(2), i)
+prime{T<:Integer}(::Type{T}, i::Integer) = i < 0 ? throw(DomainError(i)) : nextprime(T(2), i)
 prime(i::Integer) = prime(Int, i)
 
 end # module
diff --git a/test/runtests.jl b/test/runtests.jl
@@ -291,7 +291,7 @@ end
     @test totient(2^4 * 3^4 * 5^4) == 216000
     @test totient(big"2"^1000) == big"2"^999
 
-    const some_coprime_numbers = BigInt[
+    some_coprime_numbers = BigInt[
         450000000, 1099427429702334733, 200252151854851, 1416976291499, 7504637909,
         1368701327204614490999, 662333585807659, 340557446329, 1009091
     ]