diff options
| author | Aleksandar Pokopec <aleksandar.prokopec@epfl.ch> | 2011-01-26 08:37:23 +0000 |
|---|---|---|
| committer | Aleksandar Pokopec <aleksandar.prokopec@epfl.ch> | 2011-01-26 08:37:23 +0000 |
| commit | 78a48c46cf3727dd06179cb1360b2f9057647042 (patch) | |
| tree | 01f418fab8ee1cd61c5a6a891bdce09cde142098 /test/files/jvm/serialization.scala | |
| parent | 78007ac467c9d6e88ae183a9126772829072704c (diff) | |
| download | scala-78a48c46cf3727dd06179cb1360b2f9057647042.tar.gz scala-78a48c46cf3727dd06179cb1360b2f9057647042.tar.bz2 scala-78a48c46cf3727dd06179cb1360b2f9057647042.zip | |
Merge branch 'work'
Conflicts:
src/library/scala/concurrent/SyncVar.scala
Diffstat (limited to 'test/files/jvm/serialization.scala')
| -rw-r--r-- | test/files/jvm/serialization.scala | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/test/files/jvm/serialization.scala b/test/files/jvm/serialization.scala index 8c4df8fc37..6a4e37bda9 100644 --- a/test/files/jvm/serialization.scala +++ b/test/files/jvm/serialization.scala @@ -604,9 +604,9 @@ object Test9_parallel { println() // UnrolledBuffer - val ub = new UnrolledBuffer[String] + val ub = new collection.mutable.UnrolledBuffer[String] ub ++= List("one", "two") - val _ub: UnrolledBuffer[String] = read(write(ub)) + val _ub: collection.mutable.UnrolledBuffer[String] = read(write(ub)) check(ub, _ub) // mutable.ParArray |