Skip to content

Commit 005197a

Browse files
committed
Better fix of Rational-to-BigFloat ambiguity warning
(reverts a85476b)
1 parent a85476b commit 005197a

File tree

2 files changed

+2
-2
lines changed

2 files changed

+2
-2
lines changed

base/mpfr.jl

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -82,7 +82,7 @@ BigFloat(x::Union(Float16,Float32)) = BigFloat(float64(x))
8282
BigFloat(x::Rational) = BigFloat(num(x)) / BigFloat(den(x))
8383

8484
convert(::Type{Rational}, x::BigFloat) = convert(Rational{BigInt}, x)
85-
convert(::Type{BigFloat}, x::Rational) = BigFloat(x) # to resolve ambiguity
85+
convert{S}(::Type{BigFloat}, x::Rational{S}) = BigFloat(x) # to resolve ambiguity
8686
convert(::Type{BigFloat}, x::Real) = BigFloat(x)
8787
convert(::Type{FloatingPoint}, x::BigInt) = BigFloat(x)
8888

base/rational.jl

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -45,7 +45,7 @@ convert(::Type{Bool}, x::Rational) = (x!=0) # to resolve ambiguity
4545
convert{T<:Integer}(::Type{T}, x::Rational) = (isinteger(x) ? convert(T, x.num) : throw(InexactError()))
4646

4747
convert(::Type{FloatingPoint}, x::Rational) = float(x.num)/float(x.den)
48-
function convert{T<:FloatingPoint,S<:Integer}(::Type{T}, x::Rational{S})
48+
function convert{T<:FloatingPoint,S}(::Type{T}, x::Rational{S})
4949
P = promote_type(T,S)
5050
convert(P,x.num)/convert(P,x.den)
5151
end

0 commit comments

Comments
 (0)