From e981bccdb7874726af0896efdadb5e192d25c14a Mon Sep 17 00:00:00 2001 From: Antonio Cunei Date: Mon, 9 Nov 2009 16:13:33 +0000 Subject: Adds isDefinedAt to Function1. As a consequence, code that mixes in PartialFunction now have to define isDefinedAt as override. Fixes #2225. --- src/actors/scala/actors/Actor.scala | 2 +- src/actors/scala/actors/Future.scala | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) (limited to 'src/actors') 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) } -- cgit v1.2.3