diff options
| author | Aleksandar Pokopec <aleksandar.prokopec@epfl.ch> | 2011-07-11 15:17:03 +0000 |
|---|---|---|
| committer | Aleksandar Pokopec <aleksandar.prokopec@epfl.ch> | 2011-07-11 15:17:03 +0000 |
| commit | 74db0a59ad28f49bcf98ef839359697b680289cf (patch) | |
| tree | 3c840b9a21609cc9d47b163d81232b95ee7d0aa8 /src/library/scala/collection/immutable/Stream.scala | |
| parent | 9e1d24d64283a4caf47cb68c00298538ca0b9999 (diff) | |
| download | scala-74db0a59ad28f49bcf98ef839359697b680289cf.tar.gz scala-74db0a59ad28f49bcf98ef839359697b680289cf.tar.bz2 scala-74db0a59ad28f49bcf98ef839359697b680289cf.zip | |
Fixes #4761.
This changes the signature of flatten - I do not see how to use a @bridge annotation here, since after erasure both the bridge and the original method have the same signature.
Review by extempore.
Diffstat (limited to 'src/library/scala/collection/immutable/Stream.scala')
| -rw-r--r-- | src/library/scala/collection/immutable/Stream.scala | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/src/library/scala/collection/immutable/Stream.scala b/src/library/scala/collection/immutable/Stream.scala index 5f90202522..a0e5668349 100644 --- a/src/library/scala/collection/immutable/Stream.scala +++ b/src/library/scala/collection/immutable/Stream.scala @@ -484,7 +484,7 @@ self => result } - override def flatten[B](implicit asTraversable: A => /*<:<!!!*/ TraversableOnce[B]): Stream[B] = { + override def flatten[B](implicit asTraversable: A => /*<:<!!!*/ GenTraversableOnce[B]): Stream[B] = { def flatten1(t: Traversable[B]): Stream[B] = if (!t.isEmpty) cons(t.head, flatten1(t.tail)) @@ -492,7 +492,7 @@ self => tail.flatten if (isEmpty) Stream.empty - else flatten1(asTraversable(head).toTraversable) + else flatten1(asTraversable(head).seq.toTraversable) } override def view = new StreamView[A, Stream[A]] { |