diff options
| author | Paul Phillips <paulp@improving.org> | 2012-04-23 08:25:17 -0700 |
|---|---|---|
| committer | Paul Phillips <paulp@improving.org> | 2012-04-23 08:25:17 -0700 |
| commit | b0ed33a2a2902aa10b20060c97d144cb07297635 (patch) | |
| tree | bf442c1046184f0ce9afc42bce3863bf8bebda53 /src | |
| parent | f47f0c9708b9276eaa658f9f24f73d8431e227d3 (diff) | |
| parent | 72052b6070cf602b3b84f1ec41df332860e93c3c (diff) | |
| download | scala-b0ed33a2a2902aa10b20060c97d144cb07297635.tar.gz scala-b0ed33a2a2902aa10b20060c97d144cb07297635.tar.bz2 scala-b0ed33a2a2902aa10b20060c97d144cb07297635.zip | |
Merge commit 'refs/pull/425/head' into develop
Diffstat (limited to 'src')
| -rw-r--r-- | src/library/scala/math/Numeric.scala | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/src/library/scala/math/Numeric.scala b/src/library/scala/math/Numeric.scala index 1f4e3c9865..ee62706e49 100644 --- a/src/library/scala/math/Numeric.scala +++ b/src/library/scala/math/Numeric.scala @@ -36,8 +36,8 @@ object Numeric { def fromInt(x: Int): BigInt = BigInt(x) def toInt(x: BigInt): Int = x.intValue def toLong(x: BigInt): Long = x.longValue - def toFloat(x: BigInt): Float = x.longValue.toFloat - def toDouble(x: BigInt): Double = x.longValue.toDouble + def toFloat(x: BigInt): Float = x.floatValue + def toDouble(x: BigInt): Double = x.doubleValue } implicit object BigIntIsIntegral extends BigIntIsIntegral with Ordering.BigIntOrdering |