diff options
-rw-r--r-- | test/files/jvm5/annotations.scala | 1 | ||||
-rw-r--r-- | test/files/neg/variances.scala | 4 |
2 files changed, 3 insertions, 2 deletions
diff --git a/test/files/jvm5/annotations.scala b/test/files/jvm5/annotations.scala index 5c4d3ec996..addf2bb07f 100644 --- a/test/files/jvm5/annotations.scala +++ b/test/files/jvm5/annotations.scala @@ -125,6 +125,7 @@ object Test4 { object Test5 { import scala.reflect.BeanProperty + import java.lang.Integer class Count { // we use "Integer" instead of "Int" because of Java reflection @BeanProperty diff --git a/test/files/neg/variances.scala b/test/files/neg/variances.scala index f84ee8d5d5..0f9390c186 100644 --- a/test/files/neg/variances.scala +++ b/test/files/neg/variances.scala @@ -50,12 +50,12 @@ object Covariant { val b : Int = 42 } class Test extends AbstractTest { - val a : Foo[Character] = new Foo[Character] + val a : Foo[java.lang.Character] = new Foo[java.lang.Character] } def main(args : Array[String]) : Unit = { val test = new Test test.c.doit(test.b) - val x : Character = test.a.getA + val x : java.lang.Character = test.a.getA Console.println("XXX " + x) } } |