summaryrefslogtreecommitdiff
path: root/src/library/scala/collection/immutable/ListMap.scala
diff options
context:
space:
mode:
authorMartin Odersky <odersky@gmail.com>2011-04-27 10:26:39 +0000
committerMartin Odersky <odersky@gmail.com>2011-04-27 10:26:39 +0000
commit6d653c3d07b31b160cf9444b06d9fe91fc32651a (patch)
treed12f9a700b69153ef916d886c0d36704098bc271 /src/library/scala/collection/immutable/ListMap.scala
parentc79f8876aa04370fc99692f73825392ea48d02e2 (diff)
downloadscala-6d653c3d07b31b160cf9444b06d9fe91fc32651a.tar.gz
scala-6d653c3d07b31b160cf9444b06d9fe91fc32651a.tar.bz2
scala-6d653c3d07b31b160cf9444b06d9fe91fc32651a.zip
More bridges in collections. Review by prokopec.
Diffstat (limited to 'src/library/scala/collection/immutable/ListMap.scala')
-rw-r--r--src/library/scala/collection/immutable/ListMap.scala5
1 files changed, 4 insertions, 1 deletions
diff --git a/src/library/scala/collection/immutable/ListMap.scala b/src/library/scala/collection/immutable/ListMap.scala
index a0f20c6e96..edee4a9922 100644
--- a/src/library/scala/collection/immutable/ListMap.scala
+++ b/src/library/scala/collection/immutable/ListMap.scala
@@ -12,7 +12,7 @@ package scala.collection
package immutable
import generic._
-import annotation.tailrec
+import annotation.{tailrec, bridge}
/** $factoryInfo
* @since 1
@@ -100,6 +100,9 @@ class ListMap[A, +B] extends Map[A, B] with MapLike[A, B, ListMap[A, B]] with Se
override def ++[B1 >: B](xs: GenTraversableOnce[(A, B1)]): ListMap[A, B1] =
((repr: ListMap[A, B1]) /: xs.seq) (_ + _)
+ @bridge def ++[B1 >: B](xs: TraversableOnce[(A, B1)]): ListMap[A, B1] =
+ ++(xs: GenTraversableOnce[(A, B1)])
+
/** This creates a new mapping without the given <code>key</code>.
* If the map does not contain a mapping for the given key, the
* method returns the same map.