diff options
| author | Adriaan Moors <adriaan.moors@typesafe.com> | 2012-12-20 19:13:33 -0800 |
|---|---|---|
| committer | Adriaan Moors <adriaan.moors@typesafe.com> | 2012-12-20 19:13:33 -0800 |
| commit | 27643546e8eb4d2c5da6fc30a998e7ee799defcc (patch) | |
| tree | 2480f714bcc3a1a5e1e0ecda7a476c3b7a3a4972 /test/files/neg/t6260.check | |
| parent | 11ba640ebe3cffc1f6671e799ce2b14964f29b31 (diff) | |
| parent | 106ca1b6767c60912b6726eeb1d435f6e22a025f (diff) | |
| download | scala-27643546e8eb4d2c5da6fc30a998e7ee799defcc.tar.gz scala-27643546e8eb4d2c5da6fc30a998e7ee799defcc.tar.bz2 scala-27643546e8eb4d2c5da6fc30a998e7ee799defcc.zip | |
Merge pull request #1794 from paulp/merge-2.10.x
Merge 2.10.x into master.
Diffstat (limited to 'test/files/neg/t6260.check')
| -rw-r--r-- | test/files/neg/t6260.check | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/test/files/neg/t6260.check b/test/files/neg/t6260.check index 2b7f1a8bfb..46e9bd1dfc 100644 --- a/test/files/neg/t6260.check +++ b/test/files/neg/t6260.check @@ -1,10 +1,10 @@ -t6260.scala:3: error: bridge generated for member method apply: (x$1: Box[X])Box[Y] in anonymous class $anonfun +t6260.scala:3: error: bridge generated for member method apply: (bx: Box[X])Box[Y] in anonymous class $anonfun which overrides method apply: (v1: T1)R in trait Function1 clashes with definition of the member itself; both have erased type (v1: Object)Object ((bx: Box[X]) => new Box(f(bx.x)))(this) ^ -t6260.scala:8: error: bridge generated for member method apply: (x$1: Box[X])Box[Y] in anonymous class $anonfun +t6260.scala:8: error: bridge generated for member method apply: (bx: Box[X])Box[Y] in anonymous class $anonfun which overrides method apply: (v1: T1)R in trait Function1 clashes with definition of the member itself; both have erased type (v1: Object)Object |