diff options
| author | Josh Suereth <joshua.suereth@gmail.com> | 2012-09-27 13:18:45 -0400 |
|---|---|---|
| committer | Josh Suereth <joshua.suereth@gmail.com> | 2012-09-27 13:18:45 -0400 |
| commit | 6d39c9529d1018801a4fda95466bf8720416abad (patch) | |
| tree | 6880f41a6368a6e130ee7ab428ae87698ce4930e /src/continuations | |
| parent | 6ec0fe522256e48f8ccc0204d7c4ed63a34d9ede (diff) | |
| parent | 709bb01175c512d124da9874dcaea50022374715 (diff) | |
| download | scala-6d39c9529d1018801a4fda95466bf8720416abad.tar.gz scala-6d39c9529d1018801a4fda95466bf8720416abad.tar.bz2 scala-6d39c9529d1018801a4fda95466bf8720416abad.zip | |
Merge 2.10.x into master to fix breaking tests and keep things up-to-date.
Diffstat (limited to 'src/continuations')
| -rw-r--r-- | src/continuations/library/scala/util/continuations/ControlContext.scala | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/src/continuations/library/scala/util/continuations/ControlContext.scala b/src/continuations/library/scala/util/continuations/ControlContext.scala index 37e3f45a4f..0ad880f26a 100644 --- a/src/continuations/library/scala/util/continuations/ControlContext.scala +++ b/src/continuations/library/scala/util/continuations/ControlContext.scala @@ -101,7 +101,7 @@ final class ControlContext[+A,-B,+C](val fun: (A => B, Exception => B) => C, val @noinline final def map[A1](f: A => A1): ControlContext[A1,B,C] = { if (fun eq null) try { - new ControlContext(null, f(x)) // TODO: only alloc if f(x) != x + new ControlContext[A1,B,C](null, f(x)) // TODO: only alloc if f(x) != x } catch { case ex: Exception => new ControlContext((k: A1 => B, thr: Exception => B) => thr(ex).asInstanceOf[C], null.asInstanceOf[A1]) |