diff options
Diffstat (limited to 'src/library/scalax/collection/immutable/OrderedIterable.scala')
-rw-r--r-- | src/library/scalax/collection/immutable/OrderedIterable.scala | 10 |
1 files changed, 6 insertions, 4 deletions
diff --git a/src/library/scalax/collection/immutable/OrderedIterable.scala b/src/library/scalax/collection/immutable/OrderedIterable.scala index 1c3fb67fb2..80fa418eec 100644 --- a/src/library/scalax/collection/immutable/OrderedIterable.scala +++ b/src/library/scalax/collection/immutable/OrderedIterable.scala @@ -1,6 +1,7 @@ package scalax.collection.immutable -import generic.covariant +import generic._ +import annotation.unchecked.uncheckedVariance /** Collection classes mixing in this class provide a method * <code>elements</code> which returns an iterator over all the @@ -13,11 +14,12 @@ import generic.covariant * @owner Martin Odersky * @version 2.8 */ -trait OrderedIterable[+A] extends Iterable[A] - with covariant.OrderedIterableTemplate[OrderedIterable, A] +trait OrderedIterable[+A] extends immutable.Iterable[A] + with OrderedIterableTemplate[OrderedIterable, A @uncheckedVariance] with collection.OrderedIterable[A] -object OrderedIterable extends covariant.IterableFactory[OrderedIterable] { +object OrderedIterable extends IterableFactory[OrderedIterable] + with EmptyIterableFactory[OrderedIterable] { val empty: OrderedIterable[Nothing] = Nil } |