diff options
Diffstat (limited to 'src/actors')
-rw-r--r-- | src/actors/scala/actors/Future.scala | 8 | ||||
-rw-r--r-- | src/actors/scala/actors/Scheduler.scala | 21 | ||||
-rw-r--r-- | src/actors/scala/actors/package.scala | 25 | ||||
-rw-r--r-- | src/actors/scala/actors/remote/RemoteActor.scala | 8 |
4 files changed, 0 insertions, 62 deletions
diff --git a/src/actors/scala/actors/Future.scala b/src/actors/scala/actors/Future.scala index aaaf5691f1..735c13190b 100644 --- a/src/actors/scala/actors/Future.scala +++ b/src/actors/scala/actors/Future.scala @@ -27,14 +27,6 @@ abstract class Future[+T] extends Responder[T] with Function0[T] { private[actors] var fvalue: Option[Any] = None private[actors] def fvalueTyped = fvalue.get.asInstanceOf[T] - @deprecated("this member is going to be removed in a future release", "2.8.0") - def ch: InputChannel[Any] = inputChannel - - @deprecated("this member is going to be removed in a future release", "2.8.0") - protected def value: Option[Any] = fvalue - @deprecated("this member is going to be removed in a future release", "2.8.0") - protected def value_=(x: Option[Any]) { fvalue = x } - /** Tests whether the future's result is available. * * @return `true` if the future's result is available, diff --git a/src/actors/scala/actors/Scheduler.scala b/src/actors/scala/actors/Scheduler.scala index 0729ff5bc8..591828ba10 100644 --- a/src/actors/scala/actors/Scheduler.scala +++ b/src/actors/scala/actors/Scheduler.scala @@ -37,25 +37,4 @@ object Scheduler extends DelegatingScheduler { Debug.info(this+": starting new "+sched+" ["+sched.getClass+"]") sched } - - /* Only `ForkJoinScheduler` implements this method. - */ - @deprecated("snapshot will be removed", "2.8.0") - def snapshot() { - if (sched.isInstanceOf[ForkJoinScheduler]) { - sched.asInstanceOf[ForkJoinScheduler].snapshot() - } else - sys.error("scheduler does not implement snapshot") - } - - /* Only `ForkJoinScheduler` implements this method. - */ - @deprecated("restart will be removed", "2.8.0") - def restart() { - if (sched.isInstanceOf[ForkJoinScheduler]) { - sched.asInstanceOf[ForkJoinScheduler].restart() - } else - sys.error("scheduler does not implement restart") - } - } diff --git a/src/actors/scala/actors/package.scala b/src/actors/scala/actors/package.scala index 1fd9fd7699..d809816ff6 100644 --- a/src/actors/scala/actors/package.scala +++ b/src/actors/scala/actors/package.scala @@ -19,29 +19,4 @@ package object actors { // type of Reactors tracked by termination detector private[actors] type TrackedReactor = Reactor[A] forSome { type A >: Null } - - @deprecated("use scheduler.ForkJoinScheduler instead", "2.8.0") - type FJTaskScheduler2 = scala.actors.scheduler.ForkJoinScheduler - - @deprecated("use scheduler.ForkJoinScheduler instead", "2.8.0") - type TickedScheduler = scala.actors.scheduler.ForkJoinScheduler - - @deprecated("use scheduler.ForkJoinScheduler instead", "2.8.0") - type WorkerThreadScheduler = scala.actors.scheduler.ForkJoinScheduler - - @deprecated("this class is going to be removed in a future release", "2.8.0") - type WorkerThread = java.lang.Thread - - @deprecated("use scheduler.SingleThreadedScheduler instead", "2.8.0") - type SingleThreadedScheduler = scala.actors.scheduler.SingleThreadedScheduler - - // This used to do a blind cast and throw a CCE after the package - // object was loaded. I have replaced with a variation that should work - // in whatever cases that was working but fail less exceptionally for - // those not intentionally using it. - @deprecated("this value is going to be removed in a future release", "2.8.0") - val ActorGC = scala.actors.Scheduler.impl match { - case x: scala.actors.scheduler.ActorGC => x - case _ => null - } } diff --git a/src/actors/scala/actors/remote/RemoteActor.scala b/src/actors/scala/actors/remote/RemoteActor.scala index f6ef62bc10..23cbae8532 100644 --- a/src/actors/scala/actors/remote/RemoteActor.scala +++ b/src/actors/scala/actors/remote/RemoteActor.scala @@ -81,10 +81,6 @@ object RemoteActor { kern } - @deprecated("this member is going to be removed in a future release", "2.8.0") - def createKernelOnPort(port: Int): NetKernel = - createNetKernelOnPort(port) - /** * Registers <code>a</code> under <code>name</code> on this * node. @@ -120,10 +116,6 @@ object RemoteActor { private[remote] def someNetKernel: NetKernel = kernels.valuesIterator.next - - @deprecated("this member is going to be removed in a future release", "2.8.0") - def someKernel: NetKernel = - someNetKernel } |