diff options
| author | Martin Odersky <odersky@gmail.com> | 2007-01-16 20:33:20 +0000 |
|---|---|---|
| committer | Martin Odersky <odersky@gmail.com> | 2007-01-16 20:33:20 +0000 |
| commit | 6093bbedc0c0cf39650c4cd931afb18feb1bcda8 (patch) | |
| tree | 3c812fab17a33c73b6ce03bb9129d0674dd1b6bf /src/actors | |
| parent | 96376cd15412c66bcd30e9b397f211eec4e7bf35 (diff) | |
| download | scala-6093bbedc0c0cf39650c4cd931afb18feb1bcda8.tar.gz scala-6093bbedc0c0cf39650c4cd931afb18feb1bcda8.tar.bz2 scala-6093bbedc0c0cf39650c4cd931afb18feb1bcda8.zip | |
enabled -Xunapply.
fixed bug contrib 291.
Added Map/Set types to Predef.
Option no longer inherits from Iterable, but there's an implicit conversion.
various other small things.
Diffstat (limited to 'src/actors')
| -rw-r--r-- | src/actors/scala/actors/Channel.scala | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/src/actors/scala/actors/Channel.scala b/src/actors/scala/actors/Channel.scala index 89ee7e9473..29293b3286 100644 --- a/src/actors/scala/actors/Channel.scala +++ b/src/actors/scala/actors/Channel.scala @@ -81,7 +81,7 @@ class Channel[Msg] extends InputChannel[Msg] with OutputChannel[Msg] { def ? : Msg = receive { case any => any } - def poll = { + def poll: Option[Msg] = { Some(?) } orElse { None.asInstanceOf[Option[Msg]] |