diff options
| author | Josh Suereth <Joshua.Suereth@gmail.com> | 2012-06-27 16:19:47 -0700 |
|---|---|---|
| committer | Josh Suereth <Joshua.Suereth@gmail.com> | 2012-06-27 16:19:47 -0700 |
| commit | 2261452d18e955e16bbe43e7a21e8d79c44325e8 (patch) | |
| tree | 401d83a9422d19acf14342e0f189816ec4a1f4ec /src | |
| parent | ebd1955ae6b1d16d76da82153cc6957e71532916 (diff) | |
| parent | c4e059edcf3492a99fc6de5136ae59a7dcd878dc (diff) | |
| download | scala-2261452d18e955e16bbe43e7a21e8d79c44325e8.tar.gz scala-2261452d18e955e16bbe43e7a21e8d79c44325e8.tar.bz2 scala-2261452d18e955e16bbe43e7a21e8d79c44325e8.zip | |
Merge pull request #791 from axel22/issue/5336
Fix SI-5336.
Diffstat (limited to 'src')
| -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] |