diff options
| author | Jason Zaugg <jzaugg@gmail.com> | 2014-09-16 11:36:51 +1000 |
|---|---|---|
| committer | Jason Zaugg <jzaugg@gmail.com> | 2014-09-16 11:36:51 +1000 |
| commit | 2724a1ce206eee03d984472b19ac908fc62e9ccc (patch) | |
| tree | ba39a0e0ba6d6d896e898526316d567ea080ff5f /test/files/jvm | |
| parent | c154d343348218d1008e4217713246c3e23acd1d (diff) | |
| parent | abd595db299024b76f75da0728ae7ec4fca4bcae (diff) | |
| download | scala-2724a1ce206eee03d984472b19ac908fc62e9ccc.tar.gz scala-2724a1ce206eee03d984472b19ac908fc62e9ccc.tar.bz2 scala-2724a1ce206eee03d984472b19ac908fc62e9ccc.zip | |
Merge commit 'abd595d' into merge/2.11.x-to-2.12.x-20140915
Diffstat (limited to 'test/files/jvm')
| -rw-r--r-- | test/files/jvm/varargs/VaClass.scala | 4 |
1 files changed, 3 insertions, 1 deletions
diff --git a/test/files/jvm/varargs/VaClass.scala b/test/files/jvm/varargs/VaClass.scala index e94e8a625a..d83e63ace1 100644 --- a/test/files/jvm/varargs/VaClass.scala +++ b/test/files/jvm/varargs/VaClass.scala @@ -9,5 +9,7 @@ class VaClass { @varargs def vs(a: Int, b: String*) = println(a + b.length) @varargs def vi(a: Int, b: Int*) = println(a + b.sum) @varargs def vt[T](a: Int, b: T*) = println(a + b.length) - @varargs def vt1[T](a: Int, b: T*): T = b.head + + // TODO remove type bound after fixing SI-8786, see also https://github.com/scala/scala/pull/3961 + @varargs def vt1[T <: String](a: Int, b: T*): T = b.head } |