diff options
author | Antonio Cunei <antonio.cunei@epfl.ch> | 2011-04-20 12:16:52 +0000 |
---|---|---|
committer | Antonio Cunei <antonio.cunei@epfl.ch> | 2011-04-20 12:16:52 +0000 |
commit | e5ad9c55f8a7a97aa7c36a057078db2031f468e8 (patch) | |
tree | 85ec520f743d57148ca2bd9b5c777832e4281e1e /src/library/scala/collection/mutable/BufferLike.scala | |
parent | 7c3ec209bc28f83f008bad4d126293bcbb867113 (diff) | |
download | scala-e5ad9c55f8a7a97aa7c36a057078db2031f468e8.tar.gz scala-e5ad9c55f8a7a97aa7c36a057078db2031f468e8.tar.bz2 scala-e5ad9c55f8a7a97aa7c36a057078db2031f468e8.zip |
Fixing an incomplete svnmerge; first, revert to...
Fixing an incomplete svnmerge; first, revert to r24726.
Diffstat (limited to 'src/library/scala/collection/mutable/BufferLike.scala')
-rw-r--r-- | src/library/scala/collection/mutable/BufferLike.scala | 10 |
1 files changed, 5 insertions, 5 deletions
diff --git a/src/library/scala/collection/mutable/BufferLike.scala b/src/library/scala/collection/mutable/BufferLike.scala index 3c9e336e6f..d29ab9cd48 100644 --- a/src/library/scala/collection/mutable/BufferLike.scala +++ b/src/library/scala/collection/mutable/BufferLike.scala @@ -220,7 +220,7 @@ trait BufferLike[A, +This <: BufferLike[A, This] with Buffer[A]] * @param start the first element to append * @param len the number of elements to append */ - @deprecated("replace by: `buf ++= src.view(start, end)`", "2.8.0") + @deprecated("replace by: `buf ++= src.view(start, end)`") def ++=(src: Array[A], start: Int, len: Int) { var i = start val end = i + len @@ -239,7 +239,7 @@ trait BufferLike[A, +This <: BufferLike[A, This] with Buffer[A]] * @param elem the element to add. */ @deprecated("Use += instead if you intend to add by side effect to an existing collection.\n"+ - "Use `clone() +=' if you intend to create a new collection.", "2.8.0") + "Use `clone() +=' if you intend to create a new collection.") def + (elem: A): This = { +=(elem); repr } /** Adds two or more elements to this collection and returns @@ -253,7 +253,7 @@ trait BufferLike[A, +This <: BufferLike[A, This] with Buffer[A]] * @param elems the remaining elements to add. */ @deprecated("Use ++= instead if you intend to add by side effect to an existing collection.\n"+ - "Use `clone() ++=' if you intend to create a new collection.", "2.8.0") + "Use `clone() ++=' if you intend to create a new collection.") def + (elem1: A, elem2: A, elems: A*): This = { this += elem1 += elem2 ++= elems repr @@ -269,7 +269,7 @@ trait BufferLike[A, +This <: BufferLike[A, This] with Buffer[A]] "As of 2.8, ++ always creates a new collection, even on Buffers.\n"+ "Use ++= instead if you intend to add by side effect to an existing collection.\n" ) - def ++(xs: GenTraversableOnce[A]): This = clone() ++= xs.seq + def ++(xs: TraversableOnce[A]): This = clone() ++= xs /** Creates a new collection with all the elements of this collection except `elem`. * @@ -308,5 +308,5 @@ trait BufferLike[A, +This <: BufferLike[A, This] with Buffer[A]] "As of 2.8, -- always creates a new collection, even on Buffers.\n"+ "Use --= instead if you intend to remove by side effect from an existing collection.\n" ) - override def --(xs: GenTraversableOnce[A]): This = clone() --= xs.seq + override def --(xs: TraversableOnce[A]): This = clone() --= xs } |