diff options
| -rw-r--r-- | src/library/scala/collection/immutable/TreeMap.scala | 8 | ||||
| -rw-r--r-- | test/files/pos/t4112.scala | 12 |
2 files changed, 20 insertions, 0 deletions
diff --git a/src/library/scala/collection/immutable/TreeMap.scala b/src/library/scala/collection/immutable/TreeMap.scala index ff595ebed7..4c6baab2da 100644 --- a/src/library/scala/collection/immutable/TreeMap.scala +++ b/src/library/scala/collection/immutable/TreeMap.scala @@ -105,6 +105,14 @@ class TreeMap[A, +B](override val size: Int, t: RedBlack[A]#Tree[B])(implicit va override def + [B1 >: B] (elem1: (A, B1), elem2: (A, B1), elems: (A, B1) *): TreeMap[A, B1] = this + elem1 + elem2 ++ elems + /** Adds a number of elements provided by a traversable object + * and returns a new collection with the added elements. + * + * @param xs the traversable object. + */ + override def ++[B1 >: B](xs: TraversableOnce[(A, B1)]): TreeMap[A, B1] = + ((repr: TreeMap[A, B1]) /: xs) (_ + _) + /** A new TreeMap with the entry added is returned, * assuming that key is <em>not</em> in the TreeMap. * diff --git a/test/files/pos/t4112.scala b/test/files/pos/t4112.scala new file mode 100644 index 0000000000..311dad9e72 --- /dev/null +++ b/test/files/pos/t4112.scala @@ -0,0 +1,12 @@ + + +import collection.immutable._ + + + +object Test { + def main(args: Array[String]) { + val treemap = TreeMap(1 -> 2, 3 -> 4) ++ TreeMap(5 -> 6) + (treemap: TreeMap[Int, Int]) + } +} |