diff options
Diffstat (limited to 'src/actors')
| -rw-r--r-- | src/actors/scala/actors/AbstractActor.scala | 2 | ||||
| -rw-r--r-- | src/actors/scala/actors/ReactorCanReply.scala | 2 | ||||
| -rw-r--r-- | src/actors/scala/actors/remote/Proxy.scala | 2 |
3 files changed, 4 insertions, 2 deletions
diff --git a/src/actors/scala/actors/AbstractActor.scala b/src/actors/scala/actors/AbstractActor.scala index c25e785d76..dc7ac4cca8 100644 --- a/src/actors/scala/actors/AbstractActor.scala +++ b/src/actors/scala/actors/AbstractActor.scala @@ -18,7 +18,7 @@ package scala.actors */ trait AbstractActor extends OutputChannel[Any] with CanReply[Any, Any] { - type Future[+R] = scala.actors.Future[R] + type Future[+R] <: scala.actors.Future[R] private[actors] def exiting: Boolean = false diff --git a/src/actors/scala/actors/ReactorCanReply.scala b/src/actors/scala/actors/ReactorCanReply.scala index 884c0ceecc..f94115c491 100644 --- a/src/actors/scala/actors/ReactorCanReply.scala +++ b/src/actors/scala/actors/ReactorCanReply.scala @@ -18,7 +18,7 @@ package scala.actors private[actors] trait ReactorCanReply extends CanReply[Any, Any] { _: ReplyReactor => - override type Future[+P] = scala.actors.Future[P] + type Future[+P] = scala.actors.Future[P] def !?(msg: Any): Any = (this !! msg)() diff --git a/src/actors/scala/actors/remote/Proxy.scala b/src/actors/scala/actors/remote/Proxy.scala index 8df723adee..766f31fc6f 100644 --- a/src/actors/scala/actors/remote/Proxy.scala +++ b/src/actors/scala/actors/remote/Proxy.scala @@ -18,6 +18,8 @@ import scala.collection.mutable.HashMap private[remote] class Proxy(node: Node, name: Symbol, @transient var kernel: NetKernel) extends AbstractActor with Serializable { import java.io.{IOException, ObjectOutputStream, ObjectInputStream} + type Future[+P] = scala.actors.Future[P] + @transient private[remote] var del: Actor = null startDelegate() |