Reverted r19466, as the decision is now that

isDefinedAt should /not/ be in Function1

2 files changed, 2 insertions, 2 deletions

diff --git a/src/actors/scala/actors/Actor.scala b/src/actors/scala/actors/Actor.scala
index 69a4aab7d7..b563104f41 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] {
-    override def isDefinedAt(m: Any): Boolean =
+    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 63007b6477..38b268d795 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] {
-        override def isDefinedAt(msg: Any) = msg match {
+        def isDefinedAt(msg: Any) = msg match {
           case TIMEOUT => true
           case _ => partFuns exists (_ isDefinedAt msg)
         }