diff options
| author | Paul Phillips <paulp@improving.org> | 2011-03-17 22:40:54 +0000 |
|---|---|---|
| committer | Paul Phillips <paulp@improving.org> | 2011-03-17 22:40:54 +0000 |
| commit | ebcec5f4d657afb3dbde33128d021ec760cb528b (patch) | |
| tree | 84167506e3e74803242ac49ee1b1371ed59731f7 /test/files/pos/t1642 | |
| parent | 5647d7300922a357ab849e528fcc840afc92e33a (diff) | |
| download | scala-ebcec5f4d657afb3dbde33128d021ec760cb528b.tar.gz scala-ebcec5f4d657afb3dbde33128d021ec760cb528b.tar.bz2 scala-ebcec5f4d657afb3dbde33128d021ec760cb528b.zip | |
Reenabled the commented out bits of the test fo...
Reenabled the commented out bits of the test for #1642. No review.
Diffstat (limited to 'test/files/pos/t1642')
| -rw-r--r-- | test/files/pos/t1642/JavaCallingScalaHashMap.java | 6 | ||||
| -rw-r--r-- | test/files/pos/t1642/test.scala | 6 |
2 files changed, 3 insertions, 9 deletions
diff --git a/test/files/pos/t1642/JavaCallingScalaHashMap.java b/test/files/pos/t1642/JavaCallingScalaHashMap.java index bde3bd39c4..976e465ff7 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/pos/t1642/test.scala b/test/files/pos/t1642/test.scala deleted file mode 100644 index 72e53b0c9a..0000000000 --- a/test/files/pos/t1642/test.scala +++ /dev/null @@ -1,6 +0,0 @@ -package x -abstract class H[A] { - type P <: R[P] - def a: P -} -class R[F] |