summaryrefslogtreecommitdiff
path: root/src
diff options
context:
space:
mode:
authorJosh Suereth <Joshua.Suereth@gmail.com>2012-06-28 05:24:45 -0700
committerJosh Suereth <Joshua.Suereth@gmail.com>2012-06-28 05:24:45 -0700
commit6f08c06a35a0b70c49e23a296b13ac391a460584 (patch)
treec462c7d49a41cb1c6b0e48d4dfdf54e31832e025 /src
parentdf00b410635cd3164b74ab55d1b44fd772a65653 (diff)
parent5362f3df48a363308e41434b17fca60a0d4d84da (diff)
downloadscala-6f08c06a35a0b70c49e23a296b13ac391a460584.tar.gz
scala-6f08c06a35a0b70c49e23a296b13ac391a460584.tar.bz2
scala-6f08c06a35a0b70c49e23a296b13ac391a460584.zip
Merge pull request #790 from axel22/issue/3326
Fix SI-3326.
Diffstat (limited to 'src')
-rw-r--r--src/library/scala/collection/SortedMapLike.scala8
1 files changed, 8 insertions, 0 deletions
diff --git a/src/library/scala/collection/SortedMapLike.scala b/src/library/scala/collection/SortedMapLike.scala
index 4dc0820a62..6b25151192 100644
--- a/src/library/scala/collection/SortedMapLike.scala
+++ b/src/library/scala/collection/SortedMapLike.scala
@@ -72,4 +72,12 @@ self =>
for (e <- elems) m = m + e
m
}
+
+ /** 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: GenTraversableOnce[(A, B1)]): SortedMap[A, B1] =
+ ((repr: SortedMap[A, B1]) /: xs.seq) (_ + _)
}