diff options
author | Antonio Cunei <antonio.cunei@epfl.ch> | 2008-11-25 18:05:48 +0000 |
---|---|---|
committer | Antonio Cunei <antonio.cunei@epfl.ch> | 2008-11-25 18:05:48 +0000 |
commit | af47e5b433ea538bf096a176c88f3c91116e09cd (patch) | |
tree | b3e66e93fb653570ebbef16183cf4f2be2111c12 /test/files/neg/bug708.check | |
parent | 2d61f09332dbc6038f869c6a23a95dca1bc3b6c7 (diff) | |
download | scala-af47e5b433ea538bf096a176c88f3c91116e09cd.tar.gz scala-af47e5b433ea538bf096a176c88f3c91116e09cd.tar.bz2 scala-af47e5b433ea538bf096a176c88f3c91116e09cd.zip |
Merging everything from the 2.8.x development b...
Merging everything from the 2.8.x development branch back to trunk.
- If you were working on trunk, please keep working on trunk If you were
- working on 2.8-devel, please switch to trunk now
Diffstat (limited to 'test/files/neg/bug708.check')
-rw-r--r-- | test/files/neg/bug708.check | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/test/files/neg/bug708.check b/test/files/neg/bug708.check index 513709f2a0..cfeb01c87f 100644 --- a/test/files/neg/bug708.check +++ b/test/files/neg/bug708.check @@ -1,5 +1,5 @@ -bug708.scala:8: error: error overriding type S in trait X with bounds >: Nothing <: A.this.T; - type S has incompatible type Any +bug708.scala:8: error: overriding type S in trait X with bounds >: Nothing <: A.this.T; + type S has incompatible type override private[A] type S = Any; ^ one error found |