aboutsummaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorphaller <hallerp@gmail.com>2012-11-12 16:12:23 +0100
committerphaller <hallerp@gmail.com>2012-11-12 16:12:23 +0100
commit4b954b88c0b5671a3cb555fe5c27c05be3280cef (patch)
treedcc85df08737024b4844ecf2cc474a9229f21b93
parentb8e0e0fa3a4587bf8e15f051daa4254c10a9206e (diff)
downloadscala-async-4b954b88c0b5671a3cb555fe5c27c05be3280cef.tar.gz
scala-async-4b954b88c0b5671a3cb555fe5c27c05be3280cef.tar.bz2
scala-async-4b954b88c0b5671a3cb555fe5c27c05be3280cef.zip
Resolve feature warnings
-rw-r--r--src/main/scala/scala/async/Async.scala2
-rw-r--r--src/main/scala/scala/async/ExprBuilder.scala2
-rw-r--r--src/main/scala/scala/async/FutureSystem.scala4
3 files changed, 5 insertions, 3 deletions
diff --git a/src/main/scala/scala/async/Async.scala b/src/main/scala/scala/async/Async.scala
index b0ce892..b71ce74 100644
--- a/src/main/scala/scala/async/Async.scala
+++ b/src/main/scala/scala/async/Async.scala
@@ -3,7 +3,7 @@
*/
package scala.async
-import language.experimental.macros
+import scala.language.experimental.macros
import scala.reflect.macros.Context
import scala.collection.mutable.ListBuffer
diff --git a/src/main/scala/scala/async/ExprBuilder.scala b/src/main/scala/scala/async/ExprBuilder.scala
index 61a751c..2b35ff4 100644
--- a/src/main/scala/scala/async/ExprBuilder.scala
+++ b/src/main/scala/scala/async/ExprBuilder.scala
@@ -5,7 +5,7 @@ package scala.async
import scala.reflect.macros.Context
import scala.collection.mutable.ListBuffer
-import concurrent.Future
+import scala.concurrent.Future
import AsyncUtils.vprintln
/*
diff --git a/src/main/scala/scala/async/FutureSystem.scala b/src/main/scala/scala/async/FutureSystem.scala
index 738de34..4e471f8 100644
--- a/src/main/scala/scala/async/FutureSystem.scala
+++ b/src/main/scala/scala/async/FutureSystem.scala
@@ -3,7 +3,9 @@
*/
package scala.async
-import reflect.macros.Context
+import scala.language.higherKinds
+
+import scala.reflect.macros.Context
/**
* An abstraction over a future system.