diff options
| author | Aleksandar Pokopec <aleksandar.prokopec@epfl.ch> | 2010-11-19 13:58:42 +0000 |
|---|---|---|
| committer | Aleksandar Pokopec <aleksandar.prokopec@epfl.ch> | 2010-11-19 13:58:42 +0000 |
| commit | 72969dec9de6b569f932577283b2029c682cf1d1 (patch) | |
| tree | ab97feb1b1f337e380bf5d1d1058843a3642b55d /src | |
| parent | c9f0770b447540ea7ff2bbe3bdc0825a84f8cd53 (diff) | |
| download | scala-72969dec9de6b569f932577283b2029c682cf1d1.tar.gz scala-72969dec9de6b569f932577283b2029c682cf1d1.tar.bz2 scala-72969dec9de6b569f932577283b2029c682cf1d1.zip | |
Fix for #3686. No review.
Diffstat (limited to 'src')
| -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 1717714f16..f6acda3b48 100644 --- a/src/library/scala/collection/immutable/Stream.scala +++ b/src/library/scala/collection/immutable/Stream.scala @@ -120,9 +120,9 @@ self => */ @inline private def asThat[That](x: AnyRef): That = x.asInstanceOf[That] @inline private def asStream[B](x: AnyRef): Stream[B] = x.asInstanceOf[Stream[B]] - @inline private def buildsThis[B, That](bf: CanBuildFrom[Stream[A], B, That]) = bf.isInstanceOf[Stream.StreamCanBuildFrom[_]] + @inline private def buildsThis[B, That](b: Builder[B, That]) = b.isInstanceOf[Stream.StreamBuilder[_]] private def ifTargetThis[B, That](bf: CanBuildFrom[Stream[A], B, That])(ifIs: => Stream[B])(ifNot: => That): That = - if (buildsThis(bf)) ifIs.asInstanceOf[That] + if (buildsThis(bf(repr))) ifIs.asInstanceOf[That] else ifNot // Overridden methods from Traversable |