Skip to content

Commit ff2d914

Browse files
authored
Merge pull request #27 from mlubin/ml/fix07
fix compilation on Julia 0.7
2 parents 46d4245 + 181951e commit ff2d914

File tree

1 file changed

+6
-4
lines changed

1 file changed

+6
-4
lines changed

src/NaNMath.jl

Lines changed: 6 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -1,11 +1,13 @@
11
__precompile__()
22
module NaNMath
33

4+
const libm = Base.libm_name
5+
46
for f in (:sin, :cos, :tan, :asin, :acos, :acosh, :atanh, :log, :log2, :log10,
57
:lgamma, :log1p)
68
@eval begin
7-
($f)(x::Float64) = ccall(($(string(f)),Base.Math.libm), Float64, (Float64,), x)
8-
($f)(x::Float32) = ccall(($(string(f,"f")),Base.Math.libm), Float32, (Float32,), x)
9+
($f)(x::Float64) = ccall(($(string(f)),libm), Float64, (Float64,), x)
10+
($f)(x::Float32) = ccall(($(string(f,"f")),libm), Float32, (Float32,), x)
911
($f)(x::Real) = ($f)(float(x))
1012
function ($f)(x::AbstractArray{T}) where T<:Number
1113
Base.depwarn("$f{T<:Number}(x::AbstractArray{T}) is deprecated, use $f.(x) instead.", $f)
@@ -19,8 +21,8 @@ end
1921
sqrt(x::Real) = x < 0.0 ? NaN : Base.sqrt(x)
2022

2123
# Don't override built-in ^ operator
22-
pow(x::Float64, y::Float64) = ccall((:pow,Base.Math.libm), Float64, (Float64,Float64), x, y)
23-
pow(x::Float32, y::Float32) = ccall((:powf,Base.Math.libm), Float32, (Float32,Float32), x, y)
24+
pow(x::Float64, y::Float64) = ccall((:pow,libm), Float64, (Float64,Float64), x, y)
25+
pow(x::Float32, y::Float32) = ccall((:powf,libm), Float32, (Float32,Float32), x, y)
2426
pow(x::Number,y::Number) = pow(float(x),float(y))
2527

2628
"""

0 commit comments

Comments
 (0)