diff options
| author | Jason Zaugg <jzaugg@gmail.com> | 2013-01-19 23:05:32 +0100 |
|---|---|---|
| committer | Jason Zaugg <jzaugg@gmail.com> | 2013-01-19 23:05:32 +0100 |
| commit | 52a53280172695f651bd3913a0fcb1ac6260c33d (patch) | |
| tree | f40ed1bba2023de1e816cbba145d9ccb25d97681 /src/library/scala/collection/parallel | |
| parent | 6f72ed85c3882d2a8c824a41e6e42d7f33b8d1d6 (diff) | |
| download | scala-52a53280172695f651bd3913a0fcb1ac6260c33d.tar.gz scala-52a53280172695f651bd3913a0fcb1ac6260c33d.tar.bz2 scala-52a53280172695f651bd3913a0fcb1ac6260c33d.zip | |
Addressing warnings.
- SI-6923 uncovered a few valid warnings, these have been
addressed.
- A pair of "catches all throwable" warnings appeared; one
of the is spurious and the subject of SI-6994.
Diffstat (limited to 'src/library/scala/collection/parallel')
| -rw-r--r-- | src/library/scala/collection/parallel/mutable/ParArray.scala | 3 | ||||
| -rw-r--r-- | src/library/scala/collection/parallel/mutable/ParHashSet.scala | 2 |
2 files changed, 1 insertions, 4 deletions
diff --git a/src/library/scala/collection/parallel/mutable/ParArray.scala b/src/library/scala/collection/parallel/mutable/ParArray.scala index e4c8e5fae2..0a4f30131f 100644 --- a/src/library/scala/collection/parallel/mutable/ParArray.scala +++ b/src/library/scala/collection/parallel/mutable/ParArray.scala @@ -469,7 +469,6 @@ self => Array.copy(arr, i, targetarr, 0, until - i) pac.buff.size = pac.buff.size + until - i pac.buff.lastPtr.size = until - i - pac } otherwise { copy2builder_quick(cb, arr, until, i) i = until @@ -531,7 +530,6 @@ self => val targetarr: Array[Any] = pac.lastbuff.internalArray.asInstanceOf[Array[Any]] reverse2combiner_quick(targetarr, arr, 0, i, until) pac.lastbuff.setInternalSize(sz) - pac } otherwise { cb.ifIs[UnrolledParArrayCombiner[T]] { pac => @@ -542,7 +540,6 @@ self => reverse2combiner_quick(targetarr, arr, 0, i, until) pac.buff.size = pac.buff.size + sz pac.buff.lastPtr.size = sz - pac } otherwise super.reverse2combiner(cb) } cb diff --git a/src/library/scala/collection/parallel/mutable/ParHashSet.scala b/src/library/scala/collection/parallel/mutable/ParHashSet.scala index 3b1278f3be..57fab57348 100644 --- a/src/library/scala/collection/parallel/mutable/ParHashSet.scala +++ b/src/library/scala/collection/parallel/mutable/ParHashSet.scala @@ -85,7 +85,7 @@ extends ParSet[T] } private def readObject(in: java.io.ObjectInputStream) { - init(in, x => x) + init(in, x => ()) } import scala.collection.DebugUtils._ |