diff options
author | Adriaan Moors <adriaan.moors@typesafe.com> | 2015-06-17 15:22:05 -0700 |
---|---|---|
committer | Adriaan Moors <adriaan.moors@typesafe.com> | 2015-06-17 15:22:05 -0700 |
commit | 824e0b47bda251e90af842482baf3cf2bdbb080c (patch) | |
tree | fb64028ca0c896de57c149a086aab23180da7e35 /src/library | |
parent | a404c63d092e1c73fed41fc6ea87a254d5b4e993 (diff) | |
parent | 8e0bc0bffd31d994a6911116f170347004934c55 (diff) | |
download | scala-824e0b47bda251e90af842482baf3cf2bdbb080c.tar.gz scala-824e0b47bda251e90af842482baf3cf2bdbb080c.tar.bz2 scala-824e0b47bda251e90af842482baf3cf2bdbb080c.zip |
Merge pull request #4541 from vuakko/SI-9348_2.11.x
SI-9348 Fix missing last element in exclusive floating point ranges
Diffstat (limited to 'src/library')
-rw-r--r-- | src/library/scala/math/Numeric.scala | 6 |
1 files changed, 3 insertions, 3 deletions
diff --git a/src/library/scala/math/Numeric.scala b/src/library/scala/math/Numeric.scala index eafbf96993..9245798c17 100644 --- a/src/library/scala/math/Numeric.scala +++ b/src/library/scala/math/Numeric.scala @@ -134,7 +134,7 @@ object Numeric { def div(x: Float, y: Float): Float = x / y } trait FloatAsIfIntegral extends FloatIsConflicted with Integral[Float] { - def quot(x: Float, y: Float): Float = (BigDecimal(x) / BigDecimal(y)).floatValue + def quot(x: Float, y: Float): Float = (BigDecimal(x) quot BigDecimal(y)).floatValue def rem(x: Float, y: Float): Float = (BigDecimal(x) remainder BigDecimal(y)).floatValue } implicit object FloatIsFractional extends FloatIsFractional with Ordering.FloatOrdering @@ -158,7 +158,7 @@ object Numeric { def div(x: Double, y: Double): Double = x / y } trait DoubleAsIfIntegral extends DoubleIsConflicted with Integral[Double] { - def quot(x: Double, y: Double): Double = (BigDecimal(x) / BigDecimal(y)).doubleValue + def quot(x: Double, y: Double): Double = (BigDecimal(x) quot BigDecimal(y)).doubleValue def rem(x: Double, y: Double): Double = (BigDecimal(x) remainder BigDecimal(y)).doubleValue } @@ -178,7 +178,7 @@ object Numeric { def div(x: BigDecimal, y: BigDecimal): BigDecimal = x / y } trait BigDecimalAsIfIntegral extends BigDecimalIsConflicted with Integral[BigDecimal] { - def quot(x: BigDecimal, y: BigDecimal): BigDecimal = x / y + def quot(x: BigDecimal, y: BigDecimal): BigDecimal = x quot y def rem(x: BigDecimal, y: BigDecimal): BigDecimal = x remainder y } |