diff options
author | Martin Odersky <odersky@gmail.com> | 2009-02-13 11:59:49 +0000 |
---|---|---|
committer | Martin Odersky <odersky@gmail.com> | 2009-02-13 11:59:49 +0000 |
commit | 04840e2ed4530df9a5ca59b984bf2b37a976dc70 (patch) | |
tree | 61394762e202f8ab60e0d3a8e8ac688404241bc3 /src/library/scalax/runtime | |
parent | 708baf94764e2a839e24ca6204060a8d0664d88c (diff) | |
download | scala-04840e2ed4530df9a5ca59b984bf2b37a976dc70.tar.gz scala-04840e2ed4530df9a5ca59b984bf2b37a976dc70.tar.bz2 scala-04840e2ed4530df9a5ca59b984bf2b37a976dc70.zip |
new version of collection libraries
Diffstat (limited to 'src/library/scalax/runtime')
-rwxr-xr-x | src/library/scalax/runtime/BoxedArray.scala | 2 | ||||
-rw-r--r-- | src/library/scalax/runtime/StringVector.scala | 5 |
2 files changed, 4 insertions, 3 deletions
diff --git a/src/library/scalax/runtime/BoxedArray.scala b/src/library/scalax/runtime/BoxedArray.scala index 388d652882..47bb3a0d64 100755 --- a/src/library/scalax/runtime/BoxedArray.scala +++ b/src/library/scalax/runtime/BoxedArray.scala @@ -21,7 +21,7 @@ import collection.generic._ * @author Martin Odersky, Stephane Micheloud * @version 1.0 */ -abstract class BoxedArray[A] extends Vector[A] with mutable.VectorTemplate[BoxedArray, A] with Boxed { +abstract class BoxedArray[A] extends Vector[A] with MutableVectorTemplate[BoxedArray, A] with Boxed { /** The length of the array */ def length: Int diff --git a/src/library/scalax/runtime/StringVector.scala b/src/library/scalax/runtime/StringVector.scala index c12243bed7..a612b7d7a5 100644 --- a/src/library/scalax/runtime/StringVector.scala +++ b/src/library/scalax/runtime/StringVector.scala @@ -13,7 +13,8 @@ package scalax.runtime import collection.immutable.Vector import collection.mutable.ArrayBuffer -import collection.generic.covariant.VectorTemplate +import collection.generic.VectorTemplate +import annotation.unchecked.uncheckedVariance object StringVector { @@ -22,7 +23,7 @@ object StringVector { } @cloneable -abstract class StringVector[+A] extends VectorTemplate[StringVector, A] with Vector[A] { +abstract class StringVector[+A] extends VectorTemplate[StringVector, A @uncheckedVariance] with Vector[A] { /** The length of the string */ def length: Int |