diff options
| author | Paul Phillips <paulp@improving.org> | 2012-09-20 09:53:39 -0700 |
|---|---|---|
| committer | Paul Phillips <paulp@improving.org> | 2012-09-20 09:53:39 -0700 |
| commit | 3136e53e0ce4d73e1d2b3e8d043fff7892b2f439 (patch) | |
| tree | 69e6e4c21241e174942bce493aec289b46a6dce9 /test/files/neg/t6260.check | |
| parent | d834d90d88e1dab6a8621b13c9d4b64d3417a94e (diff) | |
| parent | d87592da76eb555f0e3fc3732169e56b1852fba1 (diff) | |
| download | scala-3136e53e0ce4d73e1d2b3e8d043fff7892b2f439.tar.gz scala-3136e53e0ce4d73e1d2b3e8d043fff7892b2f439.tar.bz2 scala-3136e53e0ce4d73e1d2b3e8d043fff7892b2f439.zip | |
Merge branch 'pull-1352-reformatted' into 2.10.x
# By Martin Odersky
* pull-1352-reformatted:
Disabled failing build manager tests.
New test case for SI-6337
New test case for closing SI-6385
Value classes: eliminated half-boxing
Cleanup of OverridingPairs
Fixes SI-6260
Diffstat (limited to 'test/files/neg/t6260.check')
| -rw-r--r-- | test/files/neg/t6260.check | 13 |
1 files changed, 13 insertions, 0 deletions
diff --git a/test/files/neg/t6260.check b/test/files/neg/t6260.check new file mode 100644 index 0000000000..2b7f1a8bfb --- /dev/null +++ b/test/files/neg/t6260.check @@ -0,0 +1,13 @@ +t6260.scala:3: error: bridge generated for member method apply: (x$1: 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 +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)))(self) + ^ +two errors found |