diff options
author | Aleksandar Prokopec <axel22@gmail.com> | 2012-06-27 16:54:56 +0200 |
---|---|---|
committer | Aleksandar Prokopec <axel22@gmail.com> | 2012-06-27 16:54:56 +0200 |
commit | c4e059edcf3492a99fc6de5136ae59a7dcd878dc (patch) | |
tree | 0be3d52e33c533025d46e61bde20f713287aaf05 | |
parent | 9a28ee1ffc085bc680c48b12ad632b9133adf020 (diff) | |
download | scala-c4e059edcf3492a99fc6de5136ae59a7dcd878dc.tar.gz scala-c4e059edcf3492a99fc6de5136ae59a7dcd878dc.tar.bz2 scala-c4e059edcf3492a99fc6de5136ae59a7dcd878dc.zip |
Fix SI-5336.
-rw-r--r-- | src/library/scala/collection/parallel/immutable/ParIterable.scala | 1 | ||||
-rw-r--r-- | src/library/scala/collection/parallel/mutable/ParIterable.scala | 3 |
2 files changed, 3 insertions, 1 deletions
diff --git a/src/library/scala/collection/parallel/immutable/ParIterable.scala b/src/library/scala/collection/parallel/immutable/ParIterable.scala index d8c42d74b0..349f4fa44c 100644 --- a/src/library/scala/collection/parallel/immutable/ParIterable.scala +++ b/src/library/scala/collection/parallel/immutable/ParIterable.scala @@ -34,6 +34,7 @@ extends collection/*.immutable*/.GenIterable[T] with collection.parallel.ParIterable[T] with GenericParTemplate[T, ParIterable] with ParIterableLike[T, ParIterable[T], collection.immutable.Iterable[T]] + with Immutable { override def companion: GenericCompanion[ParIterable] with GenericParCompanion[ParIterable] = ParIterable diff --git a/src/library/scala/collection/parallel/mutable/ParIterable.scala b/src/library/scala/collection/parallel/mutable/ParIterable.scala index 700d21d0bb..b5747a31cf 100644 --- a/src/library/scala/collection/parallel/mutable/ParIterable.scala +++ b/src/library/scala/collection/parallel/mutable/ParIterable.scala @@ -29,7 +29,8 @@ import scala.collection.GenIterable trait ParIterable[T] extends collection/*.mutable*/.GenIterable[T] with collection.parallel.ParIterable[T] with GenericParTemplate[T, ParIterable] - with ParIterableLike[T, ParIterable[T], Iterable[T]] { + with ParIterableLike[T, ParIterable[T], Iterable[T]] + with Mutable { override def companion: GenericCompanion[ParIterable] with GenericParCompanion[ParIterable] = ParIterable //protected[this] override def newBuilder = ParIterable.newBuilder[T] |