diff options
| author | Paul Phillips <paulp@improving.org> | 2012-09-11 07:07:26 -0700 |
|---|---|---|
| committer | Paul Phillips <paulp@improving.org> | 2012-09-11 07:07:26 -0700 |
| commit | f4a81fe69a13136ce66b963774476277d4464d87 (patch) | |
| tree | 5252ea37a80811b96562c014e5e14c2001a33daa /test/files/run/t5256f.check | |
| parent | 455526f52c0d7a98f2b0bef8f29e7fb542bfe600 (diff) | |
| parent | 228fb309a18d080dbcb2e51c1bbdf74da60865f9 (diff) | |
| download | scala-f4a81fe69a13136ce66b963774476277d4464d87.tar.gz scala-f4a81fe69a13136ce66b963774476277d4464d87.tar.bz2 scala-f4a81fe69a13136ce66b963774476277d4464d87.zip | |
Merge branch '2.10.x' into topic/inliner-logging
Conflicts:
src/compiler/scala/tools/nsc/backend/icode/GenICode.scala
Diffstat (limited to 'test/files/run/t5256f.check')
| -rw-r--r-- | test/files/run/t5256f.check | 8 |
1 files changed, 4 insertions, 4 deletions
diff --git a/test/files/run/t5256f.check b/test/files/run/t5256f.check index c840793fd5..e0fec85596 100644 --- a/test/files/run/t5256f.check +++ b/test/files/run/t5256f.check @@ -1,12 +1,12 @@ class A1 Test.A1 Object { - def <init>: <?> - def foo: <?> + def <init>(): Test.A1 + def foo: Nothing } class A2 Test.A2 Object { - def <init>: <?> - def foo: <?> + def <init>(): Test.this.A2 + def foo: Nothing } |