diff options
| author | Antonio Cunei <antonio.cunei@epfl.ch> | 2011-07-26 16:01:59 +0000 |
|---|---|---|
| committer | Antonio Cunei <antonio.cunei@epfl.ch> | 2011-07-26 16:01:59 +0000 |
| commit | 58a8c69efd60eb688088fbebc3069c206c3aff5b (patch) | |
| tree | 2da9c72093bcacee51386829c1c5dba84d48cdd7 | |
| parent | e8d37327e7c4ec060fc8f2588e1f2377e6a761fe (diff) | |
| download | scala-58a8c69efd60eb688088fbebc3069c206c3aff5b.tar.gz scala-58a8c69efd60eb688088fbebc3069c206c3aff5b.tar.bz2 scala-58a8c69efd60eb688088fbebc3069c206c3aff5b.zip | |
Changes for 2.8.x
| -rw-r--r-- | src/actors/scala/actors/Actor.scala | 2 | ||||
| -rw-r--r-- | src/library/scala/Enumeration.scala | 1 |
2 files changed, 1 insertions, 2 deletions
diff --git a/src/actors/scala/actors/Actor.scala b/src/actors/scala/actors/Actor.scala index a5361e44ed..006e6439a3 100644 --- a/src/actors/scala/actors/Actor.scala +++ b/src/actors/scala/actors/Actor.scala @@ -567,7 +567,7 @@ trait Actor extends AbstractActor with ReplyReactor with ActorCanReply with Inpu } else { if (onTimeout.isEmpty) { if (!f.isDefinedAt(TIMEOUT)) - sys.error("unhandled timeout") + error("unhandled timeout") val thisActor = this onTimeout = Some(new TimerTask { diff --git a/src/library/scala/Enumeration.scala b/src/library/scala/Enumeration.scala index c7c247fed7..871de3714d 100644 --- a/src/library/scala/Enumeration.scala +++ b/src/library/scala/Enumeration.scala @@ -11,7 +11,6 @@ package scala import scala.collection.SetLike import scala.collection.{ mutable, immutable, generic } import java.lang.reflect.{ Modifier, Method => JMethod, Field => JField } -import java.util.NoSuchElementException /** <p> * Defines a finite set of values specific to the enumeration. Typically |