From b92becd757d8319129fa8bd0a93af8c6fd2b23b7 Mon Sep 17 00:00:00 2001 From: Vojin Jovanovic Date: Mon, 24 Sep 2012 17:04:29 +0200 Subject: Support for scala.concurrent for the ActorRef. Review by @phaller --- src/actors-migration/scala/actors/Pattern.scala | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) (limited to 'src/actors-migration') diff --git a/src/actors-migration/scala/actors/Pattern.scala b/src/actors-migration/scala/actors/Pattern.scala index 297bcc7263..25ba191ce7 100644 --- a/src/actors-migration/scala/actors/Pattern.scala +++ b/src/actors-migration/scala/actors/Pattern.scala @@ -6,7 +6,7 @@ import language.implicitConversions object pattern { - implicit def askSupport(ar: ActorRef): AskableActorRef = + implicit def ask(ar: ActorRef): AskableActorRef = new AskableActorRef(ar) } @@ -17,9 +17,9 @@ class AskableActorRef(val ar: ActorRef) extends ActorRef { def !(message: Any)(implicit sender: ActorRef = null): Unit = ar.!(message)(sender) - def ?(message: Any)(timeout: Timeout): Future[Any] = ar.?(message, timeout.duration) + def ?(message: Any)(implicit timeout: Timeout): scala.concurrent.Future[Any] = ar.?(message, timeout.duration) - private[actors] def ?(message: Any, timeout: Duration): Future[Any] = ar.?(message, timeout) + private[actors] def ?(message: Any, timeout: Duration): scala.concurrent.Future[Any] = ar.?(message, timeout) def forward(message: Any) = ar.forward(message) -- cgit v1.2.3