From ff7589681dc8be7517c76e16acd3285ef1bb899c Mon Sep 17 00:00:00 2001
From: Aleksandar Pokopec <aleksandar.prokopec@epfl.ch>
Date: Thu, 9 Dec 2010 10:08:29 +0000
Subject: Minor changes.

No review.
---
 src/library/scala/collection/immutable/Range.scala  | 4 ++++
 test/files/pos/t1642/JavaCallingScalaHashMap.java   | 6 +++---
 test/files/scalacheck/parallel-collections/pc.scala | 2 +-
 3 files changed, 8 insertions(+), 4 deletions(-)

diff --git a/src/library/scala/collection/immutable/Range.scala b/src/library/scala/collection/immutable/Range.scala
index 0446eeb198..b6d48f453e 100644
--- a/src/library/scala/collection/immutable/Range.scala
+++ b/src/library/scala/collection/immutable/Range.scala
@@ -216,6 +216,10 @@ extends IndexedSeq[Int]
 
   final def contains(x: Int) = isWithinBoundaries(x) && ((x - start) % step == 0)
 
+  override def toParIterable = par
+
+  override def toParSeq = par
+
   override def equals(other: Any) = other match {
     case x: Range =>
       (x canEqual this) && (length == x.length) && (
diff --git a/test/files/pos/t1642/JavaCallingScalaHashMap.java b/test/files/pos/t1642/JavaCallingScalaHashMap.java
index 976e465ff7..bde3bd39c4 100644
--- a/test/files/pos/t1642/JavaCallingScalaHashMap.java
+++ b/test/files/pos/t1642/JavaCallingScalaHashMap.java
@@ -1,8 +1,8 @@
-import scala.collection.immutable.HashMap;
-import scala.collection.immutable.Map;
+// import scala.collection.immutable.HashMap;
+// import scala.collection.immutable.Map;
 
 public class JavaCallingScalaHashMap {
     public static void main( String[] args ) {
-        Map<String, Integer> hashMap = new HashMap<String, Integer>();
+        // Map<String, Integer> hashMap = new HashMap<String, Integer>();
     }
 }
diff --git a/test/files/scalacheck/parallel-collections/pc.scala b/test/files/scalacheck/parallel-collections/pc.scala
index 8d88d36610..075a76ca6a 100644
--- a/test/files/scalacheck/parallel-collections/pc.scala
+++ b/test/files/scalacheck/parallel-collections/pc.scala
@@ -52,7 +52,7 @@ object Test {
         workers = 1,
         minSize = 0,
         maxSize = 4000,
-        minSuccessfulTests = 20
+        minSuccessfulTests = 10
       ),
       pc
     )
-- 
cgit v1.2.3