diff options
| author | Aleksandar Pokopec <aleksandar.prokopec@epfl.ch> | 2010-10-28 12:10:04 +0000 |
|---|---|---|
| committer | Aleksandar Pokopec <aleksandar.prokopec@epfl.ch> | 2010-10-28 12:10:04 +0000 |
| commit | 6801b5e4900ea21b2cf7fa0dade0026b677e4ee2 (patch) | |
| tree | 68f13ea4a54f67bcd9611f25834c57a9cd84b293 /src/library | |
| parent | 8d311558f3774cd628a53fc675da93b550d06090 (diff) | |
| download | scala-6801b5e4900ea21b2cf7fa0dade0026b677e4ee2.tar.gz scala-6801b5e4900ea21b2cf7fa0dade0026b677e4ee2.tar.bz2 scala-6801b5e4900ea21b2cf7fa0dade0026b677e4ee2.zip | |
Two hashcode-related failing tests fixed.
No review.
Diffstat (limited to 'src/library')
| -rw-r--r-- | src/library/scala/collection/parallel/mutable/ParHashMap.scala | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/src/library/scala/collection/parallel/mutable/ParHashMap.scala b/src/library/scala/collection/parallel/mutable/ParHashMap.scala index 66c491086f..c87584d81e 100644 --- a/src/library/scala/collection/parallel/mutable/ParHashMap.scala +++ b/src/library/scala/collection/parallel/mutable/ParHashMap.scala @@ -178,7 +178,7 @@ self: EnvironmentPassingCombiner[(K, V), ParHashMap[K, V]] => threshold = newThreshold(_loadFactor, table.length) sizeMapInit(table.length) def setSize(sz: Int) = tableSize = sz - def insertEntry(block: Int, e: DefaultEntry[K, V]) = { + def insertEntry(/*block: Int, */e: DefaultEntry[K, V]) = { var h = index(elemHashCode(e.key)) // assertCorrectBlock(h, block) var olde = table(h).asInstanceOf[DefaultEntry[K, V]] @@ -234,7 +234,7 @@ self: EnvironmentPassingCombiner[(K, V), ParHashMap[K, V]] => while (i < chunksz) { val elem = chunkarr(i) // assertCorrectBlock(block, elem.key) - if (t.insertEntry(block, elem)) insertcount += 1 + if (t.insertEntry(elem)) insertcount += 1 i += 1 } i = 0 |