diff options
| author | Paul Phillips <paulp@improving.org> | 2013-01-25 14:15:45 -0800 |
|---|---|---|
| committer | Paul Phillips <paulp@improving.org> | 2013-01-25 16:28:44 -0800 |
| commit | f3ac123f345b095580d1839e0f67ea07c6837946 (patch) | |
| tree | 10322987043f41284f35da1d9a349e01179fcccb /src/library/scala/collection/parallel/mutable/ParArray.scala | |
| parent | f01af109ae975461fe5a3120a69814521968fcce (diff) | |
| parent | ac432bcde6b357194203d25df5f204ab8e426416 (diff) | |
| download | scala-f3ac123f345b095580d1839e0f67ea07c6837946.tar.gz scala-f3ac123f345b095580d1839e0f67ea07c6837946.tar.bz2 scala-f3ac123f345b095580d1839e0f67ea07c6837946.zip | |
Merge commit 'ac432bcde6' into pr/merge-2.10
* commit 'ac432bcde6':
Fix broken build.
SI-6434 Pretty print function types with by name arg as (=> A) => B
Removed class files.
SI-6994 Avoid spurious promiscuous catch warning
Addressing warnings.
SI-6439 Avoid spurious REPL warnings about companionship
use ArrayBuffer instead of Array to build Formulae
SI-6942 more efficient unreachability analysis
use Constant::isIntRange even if it's NIH
SI-6956 determine switchability by type, not tree
SI-5568 Comment improvements for getClass on primitive intersection.
SI-5568 Fixes verify error from getClass on refinement of value type
SI-6923 Context now buffers warnings as well as errors
Conflicts:
src/compiler/scala/tools/nsc/interpreter/IMain.scala
src/compiler/scala/tools/nsc/transform/Erasure.scala
src/compiler/scala/tools/nsc/typechecker/Contexts.scala
src/compiler/scala/tools/nsc/typechecker/Typers.scala
test/files/neg/t4851.check
Note:
This merge excludes b07228aebe7a as it breaks master.
Diffstat (limited to 'src/library/scala/collection/parallel/mutable/ParArray.scala')
| -rw-r--r-- | src/library/scala/collection/parallel/mutable/ParArray.scala | 3 |
1 files changed, 0 insertions, 3 deletions
diff --git a/src/library/scala/collection/parallel/mutable/ParArray.scala b/src/library/scala/collection/parallel/mutable/ParArray.scala index db4a59f6ba..770599e9d3 100644 --- a/src/library/scala/collection/parallel/mutable/ParArray.scala +++ b/src/library/scala/collection/parallel/mutable/ParArray.scala @@ -470,7 +470,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 @@ -532,7 +531,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 => @@ -543,7 +541,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 |