diff options
| author | Aleksandar Pokopec <aleksandar.prokopec@epfl.ch> | 2010-12-21 17:41:28 +0000 |
|---|---|---|
| committer | Aleksandar Pokopec <aleksandar.prokopec@epfl.ch> | 2010-12-21 17:41:28 +0000 |
| commit | cc1f960036c0f60caca6c8f862701dd37bac2f50 (patch) | |
| tree | edae6bdd5630303a9e8832d1952a21902eebf372 /src/library/scala/collection/parallel/ParMap.scala | |
| parent | ae67d3e8b371572251aca5c520f817df24578727 (diff) | |
| download | scala-cc1f960036c0f60caca6c8f862701dd37bac2f50.tar.gz scala-cc1f960036c0f60caca6c8f862701dd37bac2f50.tar.bz2 scala-cc1f960036c0f60caca6c8f862701dd37bac2f50.zip | |
Finer conversions for immutable parallel collec...
Finer conversions for immutable parallel collections.
Added some missing traits.
No review.
Diffstat (limited to 'src/library/scala/collection/parallel/ParMap.scala')
| -rw-r--r-- | src/library/scala/collection/parallel/ParMap.scala | 6 |
1 files changed, 3 insertions, 3 deletions
diff --git a/src/library/scala/collection/parallel/ParMap.scala b/src/library/scala/collection/parallel/ParMap.scala index b33b27c42b..4b732e6615 100644 --- a/src/library/scala/collection/parallel/ParMap.scala +++ b/src/library/scala/collection/parallel/ParMap.scala @@ -26,7 +26,7 @@ self => def mapCompanion: GenericParMapCompanion[ParMap] = ParMap - override def empty: ParMap[K, V] = new immutable.ParHashMap[K, V] + override def empty: ParMap[K, V] = new mutable.ParHashMap[K, V] override def stringPrefix = "ParMap" } @@ -34,9 +34,9 @@ self => object ParMap extends ParMapFactory[ParMap] { - def empty[K, V]: ParMap[K, V] = new immutable.ParHashMap[K, V] + def empty[K, V]: ParMap[K, V] = new mutable.ParHashMap[K, V] - def newCombiner[K, V]: Combiner[(K, V), ParMap[K, V]] = immutable.HashMapCombiner[K, V] + def newCombiner[K, V]: Combiner[(K, V), ParMap[K, V]] = mutable.ParHashMapCombiner[K, V] implicit def canBuildFrom[K, V]: CanCombineFrom[Coll, (K, V), ParMap[K, V]] = new CanCombineFromMap[K, V] |