From bc6c0bd3b444e0040fad789e352bfa421042124c Mon Sep 17 00:00:00 2001 From: extempore Date: Tue, 23 Jun 2009 14:51:55 +0000 Subject: [PATCH] As Ordered now extends Comparable, so too should Ordering extend Comparator. git-svn-id: http://lampsvn.epfl.ch/svn-repos/scala/scala/trunk@18088 5e8d7ff9-d8ef-0310-90f0-a4852d11357a --- src/library/scala/Ordering.scala | 4 +++- 1 file changed, 3 insertions(+), 1 deletion(-) diff --git a/src/library/scala/Ordering.scala b/src/library/scala/Ordering.scala index b34bc7f44..c0d6634c6 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 x comes before * y in the ordering, returns 0 iff x