summaryrefslogtreecommitdiff
path: root/src
diff options
context:
space:
mode:
authorPaul Phillips <paulp@improving.org>2009-06-23 14:51:55 +0000
committerPaul Phillips <paulp@improving.org>2009-06-23 14:51:55 +0000
commit3f9bbdbc7827070c09ab87331623740fa226221b (patch)
tree2467f218691f293ebe15d4ca5d5024c8f3be8aba /src
parent11d2fc79cff8b9995f0ea3201048ae4f09d0223c (diff)
downloadscala-3f9bbdbc7827070c09ab87331623740fa226221b.tar.gz
scala-3f9bbdbc7827070c09ab87331623740fa226221b.tar.bz2
scala-3f9bbdbc7827070c09ab87331623740fa226221b.zip
As Ordered now extends Comparable, so too should
Ordering extend Comparator.
Diffstat (limited to 'src')
-rw-r--r--src/library/scala/Ordering.scala4
1 files changed, 3 insertions, 1 deletions
diff --git a/src/library/scala/Ordering.scala b/src/library/scala/Ordering.scala
index 38f9ffa9b4..4eb1ef9eb5 100644
--- a/src/library/scala/Ordering.scala
+++ b/src/library/scala/Ordering.scala
@@ -10,6 +10,8 @@
package scala
+import java.util.Comparator
+
/** A trait for representing total orderings. It is important to
* distinguish between a type that has a total order and a representation
* of total ordering on some type. This trait is for representing the
@@ -38,7 +40,7 @@ package scala
* @version 0.9.5, 2008-04-15
*/
-trait Ordering[T] extends PartialOrdering[T] {
+trait Ordering[T] extends Comparator[T] with PartialOrdering[T] {
outer =>
/** Returns a negative integer iff <code>x</code> comes before
* <code>y</code> in the ordering, returns 0 iff <code>x</code>