diff options
author | Vojin Jovanovic <vojin.jovanovic@epfl.ch> | 2012-09-24 14:58:55 +0200 |
---|---|---|
committer | Vojin Jovanovic <vojin.jovanovic@epfl.ch> | 2012-09-25 11:14:46 +0200 |
commit | d69483662a596beb13cf6e128450a1c51881a6f6 (patch) | |
tree | 00322ad5e21483a83501fc0b7ecabee6e3a16fc8 /src | |
parent | db8dea0055739ec39c8765565c5f479ab360acf9 (diff) | |
download | scala-d69483662a596beb13cf6e128450a1c51881a6f6.tar.gz scala-d69483662a596beb13cf6e128450a1c51881a6f6.tar.bz2 scala-d69483662a596beb13cf6e128450a1c51881a6f6.zip |
SI-6305 fix.
Diffstat (limited to 'src')
5 files changed, 13 insertions, 7 deletions
diff --git a/src/actors-migration/scala/actors/MigrationSystem.scala b/src/actors-migration/scala/actors/MigrationSystem.scala index ffc93d9c6f..3dcb38e634 100644 --- a/src/actors-migration/scala/actors/MigrationSystem.scala +++ b/src/actors-migration/scala/actors/MigrationSystem.scala @@ -1,10 +1,11 @@ -package scala.actors +package scala.actors.migration +import scala.actors._ import scala.collection._ object MigrationSystem { - private[actors] val contextStack = new ThreadLocal[immutable.Stack[Boolean]] { + private[migration] val contextStack = new ThreadLocal[immutable.Stack[Boolean]] { override def initialValue() = immutable.Stack[Boolean]() } diff --git a/src/actors-migration/scala/actors/Pattern.scala b/src/actors-migration/scala/actors/Pattern.scala index a97ee3ba07..297bcc7263 100644 --- a/src/actors-migration/scala/actors/Pattern.scala +++ b/src/actors-migration/scala/actors/Pattern.scala @@ -1,7 +1,8 @@ -package scala.actors +package scala.actors.migration +import scala.actors._ import scala.concurrent.duration.Duration -import scala.language.implicitConversions +import language.implicitConversions object pattern { diff --git a/src/actors-migration/scala/actors/Props.scala b/src/actors-migration/scala/actors/Props.scala index 891e23213a..c12384ea55 100644 --- a/src/actors-migration/scala/actors/Props.scala +++ b/src/actors-migration/scala/actors/Props.scala @@ -1,4 +1,6 @@ -package scala.actors +package scala.actors.migration + +import scala.actors._ /** * ActorRef configuration object. It represents the minimal subset of Akka Props class. diff --git a/src/actors-migration/scala/actors/StashingActor.scala b/src/actors-migration/scala/actors/StashingActor.scala index 775d115d0b..9c3917b65e 100644 --- a/src/actors-migration/scala/actors/StashingActor.scala +++ b/src/actors-migration/scala/actors/StashingActor.scala @@ -1,5 +1,7 @@ -package scala.actors +package scala.actors.migration +import scala.actors._ +import scala.actors.Actor._ import scala.collection._ import scala.concurrent.duration.Duration import java.util.concurrent.TimeUnit diff --git a/src/actors-migration/scala/actors/Timeout.scala b/src/actors-migration/scala/actors/Timeout.scala index c3017d8569..32ea5f20fc 100644 --- a/src/actors-migration/scala/actors/Timeout.scala +++ b/src/actors-migration/scala/actors/Timeout.scala @@ -6,7 +6,7 @@ ** |/ ** \* */ -package scala.actors +package scala.actors.migration import scala.concurrent.duration.Duration import java.util.concurrent.TimeUnit |