diff options
| author | Jason Zaugg <jzaugg@gmail.com> | 2015-06-24 15:19:05 +1000 |
|---|---|---|
| committer | Jason Zaugg <jzaugg@gmail.com> | 2015-06-24 18:10:42 +1000 |
| commit | 1f7417c763fb199cacc6afedc6e54796916fd673 (patch) | |
| tree | bd00d7e0e47be310172f01c758c01ca5430063c4 /test/files/neg/names-defaults-neg.scala | |
| parent | 73f40564a6b19e8b15f0908c3e24f1a8fe405605 (diff) | |
| parent | 1b09e12ef3b3fea1cab56bac893295f74de23b8b (diff) | |
| download | scala-1f7417c763fb199cacc6afedc6e54796916fd673.tar.gz scala-1f7417c763fb199cacc6afedc6e54796916fd673.tar.bz2 scala-1f7417c763fb199cacc6afedc6e54796916fd673.zip | |
Merge branch '2.11.x' into merge/2.11.x-to-2.12.x-20150624
Diffstat (limited to 'test/files/neg/names-defaults-neg.scala')
| -rw-r--r-- | test/files/neg/names-defaults-neg.scala | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/test/files/neg/names-defaults-neg.scala b/test/files/neg/names-defaults-neg.scala index c809b9a7a2..b326d3b5bd 100644 --- a/test/files/neg/names-defaults-neg.scala +++ b/test/files/neg/names-defaults-neg.scala @@ -46,7 +46,7 @@ object Test extends App { def g(a: C, b: Int*) = "third" def g(a: B) = "fourth" } - t7.g(new C()) // ambigous reference + t7.g(new C()) // ambiguous reference // vararg def test5(a: Int, b: String*) = a @@ -58,7 +58,7 @@ object Test extends App { def f(a: Int, b: Object) = "first" def f(b: String, a: Int) = "second" } - println(t8.f(a = 0, b = "1")) // ambigous reference + println(t8.f(a = 0, b = "1")) // ambiguous reference // case class copy does not exist if there's a vararg |