summaryrefslogtreecommitdiff
path: root/src/scalacheck/org
diff options
context:
space:
mode:
authorAleksandar Pokopec <aleksandar.prokopec@epfl.ch>2010-10-06 14:03:00 +0000
committerAleksandar Pokopec <aleksandar.prokopec@epfl.ch>2010-10-06 14:03:00 +0000
commitf22b627730aecff56443083816c36b3e145a2474 (patch)
tree181f293e0ac47b94c038ae6cd4229f766d8bb6f3 /src/scalacheck/org
parentbf84cd2f44e3be39247e7fd05a93ca660aed1cc0 (diff)
downloadscala-f22b627730aecff56443083816c36b3e145a2474.tar.gz
scala-f22b627730aecff56443083816c36b3e145a2474.tar.bz2
scala-f22b627730aecff56443083816c36b3e145a2474.zip
Solved issues with fork join pool creators, and...
Solved issues with fork join pool creators, and the issue with scalacheck output. Done by Philipp and me. Review by phaller.
Diffstat (limited to 'src/scalacheck/org')
-rw-r--r--src/scalacheck/org/scalacheck/Test.scala4
1 files changed, 2 insertions, 2 deletions
diff --git a/src/scalacheck/org/scalacheck/Test.scala b/src/scalacheck/org/scalacheck/Test.scala
index 98d4d37163..3261862062 100644
--- a/src/scalacheck/org/scalacheck/Test.scala
+++ b/src/scalacheck/org/scalacheck/Test.scala
@@ -156,8 +156,8 @@ object Test {
* the test results. */
def check(prms: Params, p: Prop): Result = {
import prms._
- //import actors.Futures.future
- import scala.concurrent.ops.future
+ import actors.Futures.future
+ //import scala.concurrent.ops.future
assertParams(prms)
if(workers > 1)