diff options
| author | Grzegorz Kossakowski <grzegorz.kossakowski@gmail.com> | 2013-07-29 22:14:59 -0700 |
|---|---|---|
| committer | Grzegorz Kossakowski <grzegorz.kossakowski@gmail.com> | 2013-07-29 22:14:59 -0700 |
| commit | 8eb2853e19e03532c61963c87f3bf9f09cba5413 (patch) | |
| tree | 9039f4b1bce71fa1b5a5ed721d0ee27d0751c015 /test/files/neg/macro-override-macro-overrides-abstract-method-b.check | |
| parent | a72f79abf5845d25c847f7d7cde6d28a9d15612e (diff) | |
| parent | 59e21f37cb80215ada0db60363fb9f30adf6a0cd (diff) | |
| download | scala-8eb2853e19e03532c61963c87f3bf9f09cba5413.tar.gz scala-8eb2853e19e03532c61963c87f3bf9f09cba5413.tar.bz2 scala-8eb2853e19e03532c61963c87f3bf9f09cba5413.zip | |
Merge remote-tracking branch 'scala/master' into merge-2.10.x
Diffstat (limited to 'test/files/neg/macro-override-macro-overrides-abstract-method-b.check')
| -rw-r--r-- | test/files/neg/macro-override-macro-overrides-abstract-method-b.check | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/test/files/neg/macro-override-macro-overrides-abstract-method-b.check b/test/files/neg/macro-override-macro-overrides-abstract-method-b.check index c49918c0b7..c733555549 100644 --- a/test/files/neg/macro-override-macro-overrides-abstract-method-b.check +++ b/test/files/neg/macro-override-macro-overrides-abstract-method-b.check @@ -1,7 +1,7 @@ -Test_2.scala:3: error: anonymous class $anon inherits conflicting members: +Test_2.scala:3: error: <$anon: C with A> inherits conflicting members: macro method t in trait C of type ()Unit and method t in trait A of type ()Unit -(Note: this can be resolved by declaring an override in anonymous class $anon.) +(Note: this can be resolved by declaring an override in <$anon: C with A>.) val c2 = new C with A {} ^ Test_2.scala:5: error: overriding macro method t in trait C of type ()Unit; |