summaryrefslogtreecommitdiff
path: root/src/library/scala/concurrent/Promise.scala
diff options
context:
space:
mode:
authorAleksandar Prokopec <aleksandar.prokopec@gmail.com>2011-12-07 14:55:49 +0100
committerAleksandar Prokopec <aleksandar.prokopec@gmail.com>2011-12-07 14:55:49 +0100
commit83d0ece42e4f0c5e41e3acae61e8e41db95defc5 (patch)
tree658d2f76227d479f44039c9da4443a26eef13af2 /src/library/scala/concurrent/Promise.scala
parent014a13d2be634bb3ab3468d0c071a9a870a9a9b0 (diff)
downloadscala-83d0ece42e4f0c5e41e3acae61e8e41db95defc5.tar.gz
scala-83d0ece42e4f0c5e41e3acae61e8e41db95defc5.tar.bz2
scala-83d0ece42e4f0c5e41e3acae61e8e41db95defc5.zip
Got the futures and execution contexts related code to compile.
Diffstat (limited to 'src/library/scala/concurrent/Promise.scala')
-rw-r--r--src/library/scala/concurrent/Promise.scala4
1 files changed, 4 insertions, 0 deletions
diff --git a/src/library/scala/concurrent/Promise.scala b/src/library/scala/concurrent/Promise.scala
index c5336ab00f..898344cb66 100644
--- a/src/library/scala/concurrent/Promise.scala
+++ b/src/library/scala/concurrent/Promise.scala
@@ -10,6 +10,10 @@ package scala.concurrent
+import scala.util.Timeout
+
+
+
/** Promise is an object which can be completed with a value or failed
* with an exception.
*