diff options
| author | Martin Odersky <odersky@gmail.com> | 2012-01-29 23:53:45 +0100 |
|---|---|---|
| committer | Martin Odersky <odersky@gmail.com> | 2012-01-29 23:54:17 +0100 |
| commit | 98d7f7e9b5409af08630253756dd38805b81edb0 (patch) | |
| tree | 7407ac20e790590786b208cbb6bf7db4dd27b988 /test/files/neg/t0699.check | |
| parent | a03c34c140709e95bb6ab6a8984747b83d630eea (diff) | |
| parent | 3e49826ca0c0c57ef14bc107a45084def5520d80 (diff) | |
| download | scala-98d7f7e9b5409af08630253756dd38805b81edb0.tar.gz scala-98d7f7e9b5409af08630253756dd38805b81edb0.tar.bz2 scala-98d7f7e9b5409af08630253756dd38805b81edb0.zip | |
Merge remote-tracking branch 'paulp/inline' into topic/inline
Temporarily removed getClass from AnyVal to get build going.
Disabled anyval-childen test.
Fixed some other build problems.
Implemented step 1 + 2 of inline classes proposal.
Diffstat (limited to 'test/files/neg/t0699.check')
| -rw-r--r-- | test/files/neg/t0699.check | 6 |
1 files changed, 3 insertions, 3 deletions
diff --git a/test/files/neg/t0699.check b/test/files/neg/t0699.check index 45d3e849cc..c944da8c10 100644 --- a/test/files/neg/t0699.check +++ b/test/files/neg/t0699.check @@ -1,10 +1,10 @@ -B.scala:2: error: illegal inheritance from sealed trait T: t0699/B.scala != t0699/A.scala +B.scala:2: error: illegal inheritance from sealed trait T trait T1 extends A.T ^ -B.scala:3: error: illegal inheritance from sealed class C: t0699/B.scala != t0699/A.scala +B.scala:3: error: illegal inheritance from sealed class C trait T2 extends A.C ^ -B.scala:4: error: illegal inheritance from sealed class C: t0699/B.scala != t0699/A.scala +B.scala:4: error: illegal inheritance from sealed class C class C1 extends A.C ^ three errors found |