summaryrefslogtreecommitdiff
path: root/src/library/scalax/collection/immutable/HashMap.scala
diff options
context:
space:
mode:
Diffstat (limited to 'src/library/scalax/collection/immutable/HashMap.scala')
-rw-r--r--src/library/scalax/collection/immutable/HashMap.scala8
1 files changed, 5 insertions, 3 deletions
diff --git a/src/library/scalax/collection/immutable/HashMap.scala b/src/library/scalax/collection/immutable/HashMap.scala
index 7d3595904d..8aaa0239c1 100644
--- a/src/library/scalax/collection/immutable/HashMap.scala
+++ b/src/library/scalax/collection/immutable/HashMap.scala
@@ -37,15 +37,17 @@ object HashMap extends MapFactory[HashMap] {
@serializable
class HashMap[A, B] extends Map[A,B]
with MapTemplate[A, B, HashMap]
- with mutable.HashTable[A] {
+ with collection.mutable.HashTable[A] {
- type Entry = mutable.DefaultEntry[A, Any]
+ type Entry = collection.mutable.DefaultEntry[A, Any]
protected var later: HashMap[A, B] = null
protected var oldKey: A = _
protected var oldValue: Option[B] = _
protected var deltaSize: Int = _
+ override def empty[B] = HashMap.empty[A, B]
+
def get(key: A): Option[B] = synchronized {
var m = this
var cnt = 0
@@ -141,7 +143,7 @@ class HashMap[A, B] extends Map[A,B]
}
val ltable = last.table
val s = ltable.length
- table = new scala.Array[mutable.HashEntry[A, Entry]](s)
+ table = new scala.Array[collection.mutable.HashEntry[A, Entry]](s)
var i = 0
while (i < s) {
table(i) = copy(ltable(i).asInstanceOf[Entry])