summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorPhilipp Haller <hallerp@gmail.com>2007-05-17 11:49:08 +0000
committerPhilipp Haller <hallerp@gmail.com>2007-05-17 11:49:08 +0000
commit0e8ad86aa1f3bb3f05cc1efba205cab0fc5d1ba5 (patch)
treedb6ea12bd3761bd83da8a54a82a998317c056289
parent4c1f8c38102e4ef5905d6166d4ab6db4047d9ada (diff)
downloadscala-0e8ad86aa1f3bb3f05cc1efba205cab0fc5d1ba5.tar.gz
scala-0e8ad86aa1f3bb3f05cc1efba205cab0fc5d1ba5.tar.bz2
scala-0e8ad86aa1f3bb3f05cc1efba205cab0fc5d1ba5.zip
resolved conflict
-rw-r--r--src/actors/scala/actors/Actor.scala8
1 files changed, 7 insertions, 1 deletions
diff --git a/src/actors/scala/actors/Actor.scala b/src/actors/scala/actors/Actor.scala
index f65ec526c4..6e3179113c 100644
--- a/src/actors/scala/actors/Actor.scala
+++ b/src/actors/scala/actors/Actor.scala
@@ -617,8 +617,14 @@ trait Actor extends OutputChannel[Any] {
this
}
- def loop(body: => Unit): Nothing =
+ /**
+ * Repeatedly execute <code>body</code>.
+ *
+ * @param body the code block to be executed
+ */
+ /*def loop(body: => Unit): Nothing = {
Actor.seq(body, loop(body))
+ }*/
private[actors] var links: List[Actor] = Nil