diff options
author | Antonio Cunei <antonio.cunei@epfl.ch> | 2009-11-09 16:13:33 +0000 |
---|---|---|
committer | Antonio Cunei <antonio.cunei@epfl.ch> | 2009-11-09 16:13:33 +0000 |
commit | e981bccdb7874726af0896efdadb5e192d25c14a (patch) | |
tree | 68ec4c2c9764a935c7efd72cf00a7206b6e18166 /src/actors | |
parent | df502f4ffa5ebf83e7e97a270504202e00f512ec (diff) | |
download | scala-e981bccdb7874726af0896efdadb5e192d25c14a.tar.gz scala-e981bccdb7874726af0896efdadb5e192d25c14a.tar.bz2 scala-e981bccdb7874726af0896efdadb5e192d25c14a.zip |
Adds isDefinedAt to Function1. As a consequence,
code that mixes in PartialFunction now have to
define isDefinedAt as override.
Fixes #2225.
Diffstat (limited to 'src/actors')
-rw-r--r-- | src/actors/scala/actors/Actor.scala | 2 | ||||
-rw-r--r-- | src/actors/scala/actors/Future.scala | 2 |
2 files changed, 2 insertions, 2 deletions
diff --git a/src/actors/scala/actors/Actor.scala b/src/actors/scala/actors/Actor.scala index b563104f41..69a4aab7d7 100644 --- a/src/actors/scala/actors/Actor.scala +++ b/src/actors/scala/actors/Actor.scala @@ -210,7 +210,7 @@ object Actor { private class RecursiveProxyHandler(a: Reactor, f: PartialFunction[Any, Unit]) extends PartialFunction[Any, Unit] { - def isDefinedAt(m: Any): Boolean = + override def isDefinedAt(m: Any): Boolean = true // events are immediately removed from the mailbox def apply(m: Any) { if (f.isDefinedAt(m)) f(m) diff --git a/src/actors/scala/actors/Future.scala b/src/actors/scala/actors/Future.scala index 38b268d795..63007b6477 100644 --- a/src/actors/scala/actors/Future.scala +++ b/src/actors/scala/actors/Future.scala @@ -105,7 +105,7 @@ object Futures { def awaitWith(partFuns: Seq[PartialFunction[Any, Pair[Int, Any]]]) { val reaction: PartialFunction[Any, Unit] = new PartialFunction[Any, Unit] { - def isDefinedAt(msg: Any) = msg match { + override def isDefinedAt(msg: Any) = msg match { case TIMEOUT => true case _ => partFuns exists (_ isDefinedAt msg) } |