diff options
| author | Martin Odersky <odersky@gmail.com> | 2010-06-21 13:58:11 +0000 |
|---|---|---|
| committer | Martin Odersky <odersky@gmail.com> | 2010-06-21 13:58:11 +0000 |
| commit | bf3fb9d8b5a95d3d4fa5bcc4bb78cf3ce6164486 (patch) | |
| tree | e20a1ad68d0402620612a867224e9d4d4b2d99a6 | |
| parent | 4090a03561a202705968a5be2af81fe6563ecbb6 (diff) | |
| download | scala-bf3fb9d8b5a95d3d4fa5bcc4bb78cf3ce6164486.tar.gz scala-bf3fb9d8b5a95d3d4fa5bcc4bb78cf3ce6164486.tar.bz2 scala-bf3fb9d8b5a95d3d4fa5bcc4bb78cf3ce6164486.zip | |
Merged r22380, which fixed a problem in JavaCon...
Merged r22380, which fixed a problem in JavaConversions.
| -rw-r--r-- | src/library/scala/collection/JavaConversions.scala | 4 | ||||
| -rwxr-xr-x | src/library/scala/collection/generic/FilterMonadic.scala | 2 |
2 files changed, 3 insertions, 3 deletions
diff --git a/src/library/scala/collection/JavaConversions.scala b/src/library/scala/collection/JavaConversions.scala index c1a39e0332..80fc28e234 100644 --- a/src/library/scala/collection/JavaConversions.scala +++ b/src/library/scala/collection/JavaConversions.scala @@ -542,7 +542,7 @@ de> view of the argument. def next = { val e = ui.next ; prev = Some(e) ; e } def remove = prev match { case Some(e) => - self match { + underlying match { case ms: mutable.Set[a] => ms.remove(e.asInstanceOf[a]) prev = None @@ -618,7 +618,7 @@ de> view of the argument. def remove = prev match { case Some(k) => - self match { + underlying match { case mm: mutable.Map[a, _] => val v = mm.remove(k.asInstanceOf[a]) prev = None diff --git a/src/library/scala/collection/generic/FilterMonadic.scala b/src/library/scala/collection/generic/FilterMonadic.scala index abf2e0355d..45bba19e96 100755 --- a/src/library/scala/collection/generic/FilterMonadic.scala +++ b/src/library/scala/collection/generic/FilterMonadic.scala @@ -1,7 +1,7 @@ package scala.collection.generic /** A template trait that contains just the `map`, `flatMap`, `foreach` and `withFilter` methods - * of trait `TraverableLike`. + * of trait `TraversableLike`. */ trait FilterMonadic[+A, +Repr] { def map[B, That](f: A => B)(implicit bf: CanBuildFrom[Repr, B, That]): That |