summaryrefslogtreecommitdiff
path: root/src
diff options
context:
space:
mode:
authorGrzegorz Kossakowski <grzegorz.kossakowski@gmail.com>2015-01-20 23:30:45 +0100
committerGrzegorz Kossakowski <grzegorz.kossakowski@gmail.com>2015-01-20 23:30:45 +0100
commit51e77037f2adc4ffa7421aa36803a5874292b70d (patch)
treeb295599c4a875a7c32b9a50ee3742714a6cb779c /src
parent5b347c51632c5724e5efaa0cdf473954289d7f4e (diff)
parentc8393fdf44862cf09fca6ef4bc7899e7c0386f79 (diff)
downloadscala-51e77037f2adc4ffa7421aa36803a5874292b70d.tar.gz
scala-51e77037f2adc4ffa7421aa36803a5874292b70d.tar.bz2
scala-51e77037f2adc4ffa7421aa36803a5874292b70d.zip
Merge pull request #4253 from retronym/ticket/9087
SI-9087 Fix min/max of reversed Double/Float orderings
Diffstat (limited to 'src')
-rw-r--r--src/library/scala/math/Ordering.scala5
1 files changed, 5 insertions, 0 deletions
diff --git a/src/library/scala/math/Ordering.scala b/src/library/scala/math/Ordering.scala
index 0d7ea8bce2..827cccc77e 100644
--- a/src/library/scala/math/Ordering.scala
+++ b/src/library/scala/math/Ordering.scala
@@ -284,6 +284,9 @@ object Ordering extends LowPriorityOrderingImplicits {
override def gteq(x: Float, y: Float): Boolean = outer.gteq(y, x)
override def lt(x: Float, y: Float): Boolean = outer.lt(y, x)
override def gt(x: Float, y: Float): Boolean = outer.gt(y, x)
+ override def min(x: Float, y: Float): Float = outer.max(x, y)
+ override def max(x: Float, y: Float): Float = outer.min(x, y)
+
}
}
implicit object Float extends FloatOrdering
@@ -309,6 +312,8 @@ object Ordering extends LowPriorityOrderingImplicits {
override def gteq(x: Double, y: Double): Boolean = outer.gteq(y, x)
override def lt(x: Double, y: Double): Boolean = outer.lt(y, x)
override def gt(x: Double, y: Double): Boolean = outer.gt(y, x)
+ override def min(x: Double, y: Double): Double = outer.max(x, y)
+ override def max(x: Double, y: Double): Double = outer.min(x, y)
}
}
implicit object Double extends DoubleOrdering