diff options
author | phaller <hallerp@gmail.com> | 2012-12-19 15:53:04 +0100 |
---|---|---|
committer | phaller <hallerp@gmail.com> | 2012-12-19 15:53:04 +0100 |
commit | d44ce173fcfb3879c4adab94830d249a45ff61a4 (patch) | |
tree | 49fb3993e09ec4ed4562d05b06adaef8ab964cbe /src/main/scala/scala/async/FutureSystem.scala | |
parent | 074f7e7b405aef70c6bcc59b0037ca98b541e131 (diff) | |
parent | e8e84ba8d3e3ebf266250cdb48176a9fef5361d9 (diff) | |
download | scala-async-d44ce173fcfb3879c4adab94830d249a45ff61a4.tar.gz scala-async-d44ce173fcfb3879c4adab94830d249a45ff61a4.tar.bz2 scala-async-d44ce173fcfb3879c4adab94830d249a45ff61a4.zip |
Resolve merge conflict
Diffstat (limited to 'src/main/scala/scala/async/FutureSystem.scala')
-rw-r--r-- | src/main/scala/scala/async/FutureSystem.scala | 5 |
1 files changed, 4 insertions, 1 deletions
diff --git a/src/main/scala/scala/async/FutureSystem.scala b/src/main/scala/scala/async/FutureSystem.scala index e9373b3..f0b4653 100644 --- a/src/main/scala/scala/async/FutureSystem.scala +++ b/src/main/scala/scala/async/FutureSystem.scala @@ -51,9 +51,12 @@ trait FutureSystem { /** Complete a promise with a value */ def completeProm[A](prom: Expr[Prom[A]], value: Expr[scala.util.Try[A]]): Expr[Unit] + + def spawn(tree: context.Tree): context.Tree = + future(context.Expr[Unit](tree))(execContext).tree } - def mkOps(c: Context): Ops {val context: c.type} + def mkOps(c: Context): Ops { val context: c.type } } object ScalaConcurrentFutureSystem extends FutureSystem { |