summaryrefslogtreecommitdiff
path: root/src/actors
diff options
context:
space:
mode:
authorPhilipp Haller <hallerp@gmail.com>2007-01-24 22:18:02 +0000
committerPhilipp Haller <hallerp@gmail.com>2007-01-24 22:18:02 +0000
commit3020baca77ebfd7b64a3920bec4aec73406a429c (patch)
tree8183a818a18f654d633c14f039cd4f7630c67f5e /src/actors
parentea6777a4ea66672003b59b83c431d8d7bf70865f (diff)
downloadscala-3020baca77ebfd7b64a3920bec4aec73406a429c.tar.gz
scala-3020baca77ebfd7b64a3920bec4aec73406a429c.tar.bz2
scala-3020baca77ebfd7b64a3920bec4aec73406a429c.zip
Renamed a function to avoid shadowing.
Diffstat (limited to 'src/actors')
-rw-r--r--src/actors/scala/actors/Actor.scala6
1 files changed, 3 insertions, 3 deletions
diff --git a/src/actors/scala/actors/Actor.scala b/src/actors/scala/actors/Actor.scala
index 826535d451..79ae0e1f83 100644
--- a/src/actors/scala/actors/Actor.scala
+++ b/src/actors/scala/actors/Actor.scala
@@ -395,9 +395,9 @@ trait Actor extends OutputChannel[Any] {
/**
* Sends <code>msg</code> to this actor (asynchronous).
*/
- def !(msg: Any): Unit = send(msg, Actor.self.reply)
+ def !(msg: Any): Unit = send(msg, Actor.self.getReplyChannel)
- def forward(msg: Any): Unit = send(msg, Actor.sender.reply)
+ def forward(msg: Any): Unit = send(msg, Actor.sender.getReplyChannel)
/**
* Sends <code>msg</code> to this actor and awaits reply
@@ -423,7 +423,7 @@ trait Actor extends OutputChannel[Any] {
def reply(msg: Any): Unit = session ! msg
private var rc = new Channel[Any]
- def reply = rc
+ def getReplyChannel = rc
def freshReply() = { rc = new Channel[Any]; rc }
def ? : Any = receive {