diff options
| author | Grzegorz Kossakowski <grzegorz.kossakowski@gmail.com> | 2013-10-14 00:12:51 +0200 |
|---|---|---|
| committer | Grzegorz Kossakowski <grzegorz.kossakowski@gmail.com> | 2013-10-14 00:12:51 +0200 |
| commit | b126e5c31b2bc57df5d0d5cf3508babe1dd7a759 (patch) | |
| tree | e1c71882fe860ac0bdd1f79b0ec45757a7c888be /test/files/neg/valueclasses-doubledefs.check | |
| parent | 71d4e285064e9d3475a0badecf283ea95166df6d (diff) | |
| parent | 392d1ddb1588d69c2e8ae10a2b3e902c7229b772 (diff) | |
| download | scala-b126e5c31b2bc57df5d0d5cf3508babe1dd7a759.tar.gz scala-b126e5c31b2bc57df5d0d5cf3508babe1dd7a759.tar.bz2 scala-b126e5c31b2bc57df5d0d5cf3508babe1dd7a759.zip | |
Merge remote-tracking branch 'scala/master' into fix-merge-3018
Conflicts:
src/compiler/scala/tools/nsc/typechecker/Typers.scala
Diffstat (limited to 'test/files/neg/valueclasses-doubledefs.check')
| -rw-r--r-- | test/files/neg/valueclasses-doubledefs.check | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/test/files/neg/valueclasses-doubledefs.check b/test/files/neg/valueclasses-doubledefs.check index 556d7a0900..ec513aca6b 100644 --- a/test/files/neg/valueclasses-doubledefs.check +++ b/test/files/neg/valueclasses-doubledefs.check @@ -1,6 +1,6 @@ valueclasses-doubledefs.scala:5: error: double definition: -method apply:(x: Meter)String and -method apply:(x: Double)String at line 4 +def apply(x: Double): String at line 4 and +def apply(x: Meter): String at line 5 have same type after erasure: (x: Double)String def apply(x: Meter) = x.toString ^ |