diff options
| author | Paul Phillips <paulp@improving.org> | 2013-01-11 22:28:30 -0800 |
|---|---|---|
| committer | Paul Phillips <paulp@improving.org> | 2013-01-11 22:28:30 -0800 |
| commit | a2a37ed41fdfddeb44804f2dcc65b496c7fe0a3f (patch) | |
| tree | d206ed454c298b53a746b8950698484cbae73e45 /test/files/neg/macro-override-method-overrides-macro.check | |
| parent | ec5bcecdc579a45fe972bcefef2e1794c05babaa (diff) | |
| parent | 82dc21078e7aa6215ed32b79dece3b4c626ebea6 (diff) | |
| download | scala-a2a37ed41fdfddeb44804f2dcc65b496c7fe0a3f.tar.gz scala-a2a37ed41fdfddeb44804f2dcc65b496c7fe0a3f.tar.bz2 scala-a2a37ed41fdfddeb44804f2dcc65b496c7fe0a3f.zip | |
Merge pull request #1885 from paulp/merge/pr-1844
Resolving new merge conflicts between #1844 and master.
Diffstat (limited to 'test/files/neg/macro-override-method-overrides-macro.check')
| -rw-r--r-- | test/files/neg/macro-override-method-overrides-macro.check | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/test/files/neg/macro-override-method-overrides-macro.check b/test/files/neg/macro-override-method-overrides-macro.check index 66dc11be96..e8cba5d029 100644 --- a/test/files/neg/macro-override-method-overrides-macro.check +++ b/test/files/neg/macro-override-method-overrides-macro.check @@ -1,5 +1,5 @@ Macros_Test_2.scala:8: error: overriding macro method foo in class B of type (x: String)Unit; - method foo cannot override a macro + method foo cannot be used here - only term macros can override term macros override def foo(x: String) = println("fooDString") ^ one error found |