summaryrefslogtreecommitdiff
path: root/src/actors
diff options
context:
space:
mode:
authorGilles Dubochet <gilles.dubochet@epfl.ch>2009-05-27 19:35:02 +0000
committerGilles Dubochet <gilles.dubochet@epfl.ch>2009-05-27 19:35:02 +0000
commitcc5e79c9ec9cea8d0f22020b528877d8f6e00153 (patch)
tree94e43f77c7b7271b3d0b6f9fb7372ae83b39360d /src/actors
parent4b8be5d8bec86358276407d6521c41702ccda835 (diff)
downloadscala-cc5e79c9ec9cea8d0f22020b528877d8f6e00153.tar.gz
scala-cc5e79c9ec9cea8d0f22020b528877d8f6e00153.tar.bz2
scala-cc5e79c9ec9cea8d0f22020b528877d8f6e00153.zip
In "Iterable" and in all its subclasses, "itera...
In "Iterable" and in all its subclasses, "iterator" replaces "elements" (and assorted changes).
Diffstat (limited to 'src/actors')
-rw-r--r--src/actors/scala/actors/Actor.scala4
-rw-r--r--src/actors/scala/actors/remote/RemoteActor.scala2
2 files changed, 3 insertions, 3 deletions
diff --git a/src/actors/scala/actors/Actor.scala b/src/actors/scala/actors/Actor.scala
index 1996bd3f7a..a61de1b249 100644
--- a/src/actors/scala/actors/Actor.scala
+++ b/src/actors/scala/actors/Actor.scala
@@ -946,7 +946,7 @@ trait Actor extends AbstractActor {
}
private[actors] def unlinkFrom(from: AbstractActor) = synchronized {
- links = links.remove(from.==)
+ links = links.filterNot(from.==)
}
var trapExit = false
@@ -990,7 +990,7 @@ trait Actor extends AbstractActor {
private[actors] def exitLinked() {
exiting = true
// remove this from links
- val mylinks = links.remove(this.==)
+ val mylinks = links.filterNot(this.==)
// exit linked processes
mylinks.foreach((linked: AbstractActor) => {
unlink(linked)
diff --git a/src/actors/scala/actors/remote/RemoteActor.scala b/src/actors/scala/actors/remote/RemoteActor.scala
index 6c01b770ca..f699515add 100644
--- a/src/actors/scala/actors/remote/RemoteActor.scala
+++ b/src/actors/scala/actors/remote/RemoteActor.scala
@@ -118,7 +118,7 @@ object RemoteActor {
}
def someKernel: NetKernel =
- kernels.values.next
+ kernels.valuesIterator.next
}