diff options
author | Philipp Haller <hallerp@gmail.com> | 2011-03-17 09:55:42 +0000 |
---|---|---|
committer | Philipp Haller <hallerp@gmail.com> | 2011-03-17 09:55:42 +0000 |
commit | c9822430643f44386cb02f595212a2c5bc66b38f (patch) | |
tree | 30dd416d146e86187403d100db061083b5de1653 /src/actors | |
parent | eb0b73b1160c7e62e2ae0e338a9664b8b53ddbde (diff) | |
download | scala-c9822430643f44386cb02f595212a2c5bc66b38f.tar.gz scala-c9822430643f44386cb02f595212a2c5bc66b38f.tar.bz2 scala-c9822430643f44386cb02f595212a2c5bc66b38f.zip |
Removed uniqueness annotations. Review by rytz.
Diffstat (limited to 'src/actors')
-rw-r--r-- | src/actors/scala/actors/CanReply.scala | 10 | ||||
-rw-r--r-- | src/actors/scala/actors/OutputChannel.scala | 8 |
2 files changed, 7 insertions, 11 deletions
diff --git a/src/actors/scala/actors/CanReply.scala b/src/actors/scala/actors/CanReply.scala index a4619a986e..de2c91d747 100644 --- a/src/actors/scala/actors/CanReply.scala +++ b/src/actors/scala/actors/CanReply.scala @@ -9,8 +9,6 @@ package scala.actors -import scala.annotation.unique.unique - /** * Defines result-bearing message send operations. * @@ -29,7 +27,7 @@ trait CanReply[-T, +R] { * @param msg the message to be sent * @return the reply */ - def !?(msg: T @unique): R + def !?(msg: T): R /** * Sends <code>msg</code> to this $actor and @@ -41,7 +39,7 @@ trait CanReply[-T, +R] { * @return <code>None</code> in case of timeout, otherwise * <code>Some(x)</code> where <code>x</code> is the reply */ - def !?(msec: Long, msg: T @unique): Option[R] + def !?(msec: Long, msg: T): Option[R] /** * Sends <code>msg</code> to this $actor and @@ -50,7 +48,7 @@ trait CanReply[-T, +R] { * @param msg the message to be sent * @return the future */ - def !!(msg: T @unique): Future[R] + def !!(msg: T): Future[R] /** * Sends <code>msg</code> to this $actor and @@ -63,6 +61,6 @@ trait CanReply[-T, +R] { * @param handler the function to be applied to the response * @return the future */ - def !![P](msg: T @unique, handler: PartialFunction[R, P]): Future[P] + def !![P](msg: T, handler: PartialFunction[R, P]): Future[P] } diff --git a/src/actors/scala/actors/OutputChannel.scala b/src/actors/scala/actors/OutputChannel.scala index d68e49a1b1..35a95c3762 100644 --- a/src/actors/scala/actors/OutputChannel.scala +++ b/src/actors/scala/actors/OutputChannel.scala @@ -9,8 +9,6 @@ package scala.actors -import scala.annotation.unique.unique - /** * A common interface for all channels to which values can be sent. * @@ -25,7 +23,7 @@ trait OutputChannel[-Msg] { * * @param msg the message to send */ - def !(msg: Msg @unique): Unit + def !(msg: Msg): Unit /** * Sends <code>msg</code> to this $actor (asynchronous) supplying @@ -34,14 +32,14 @@ trait OutputChannel[-Msg] { * @param msg the message to send * @param replyTo the reply destination */ - def send(msg: Msg @unique, replyTo: OutputChannel[Any]): Unit + def send(msg: Msg, replyTo: OutputChannel[Any]): Unit /** * Forwards <code>msg</code> to this $actor (asynchronous). * * @param msg the message to forward */ - def forward(msg: Msg @unique): Unit + def forward(msg: Msg): Unit /** * Returns the <code>Actor</code> that is receiving from this $actor. |