diff options
| author | Antonio Cunei <antonio.cunei@epfl.ch> | 2011-04-20 12:19:47 +0000 |
|---|---|---|
| committer | Antonio Cunei <antonio.cunei@epfl.ch> | 2011-04-20 12:19:47 +0000 |
| commit | 517acfdd56af4562d3c4f2963f656f2834ca23e2 (patch) | |
| tree | 609c95d6aafff786460300162991ce5b31fe8c32 /src/build/genprod.scala | |
| parent | e5ad9c55f8a7a97aa7c36a057078db2031f468e8 (diff) | |
| download | scala-517acfdd56af4562d3c4f2963f656f2834ca23e2.tar.gz scala-517acfdd56af4562d3c4f2963f656f2834ca23e2.tar.bz2 scala-517acfdd56af4562d3c4f2963f656f2834ca23e2.zip | |
Fixing an incomplete svnmerge; second, merge ag...
Fixing an incomplete svnmerge; second, merge again from trunk.
Diffstat (limited to 'src/build/genprod.scala')
| -rw-r--r-- | src/build/genprod.scala | 6 |
1 files changed, 3 insertions, 3 deletions
diff --git a/src/build/genprod.scala b/src/build/genprod.scala index d587d0464d..315af55d41 100644 --- a/src/build/genprod.scala +++ b/src/build/genprod.scala @@ -238,7 +238,7 @@ class Function(val i: Int) extends Group("Function") with Arity { curryComment + " def curried: %s => R = {\n %s\n }\n".format( targs mkString " => ", body - ) + """ @deprecated("Use 'curried' instead")""" + "\n def curry = curried\n" + ) + """ @deprecated("Use 'curried' instead", "2.8.0")""" + "\n def curry = curried\n" } override def moreMethods = curryMethod + tupleMethod @@ -280,7 +280,7 @@ object TupleTwo extends Tuple(2) */ def swap: Tuple2[T2,T1] = Tuple2(_2, _1) - @deprecated("Use `zipped` instead.") + @deprecated("Use `zipped` instead.", "2.9.0") def zip[Repr1, El1, El2, To](implicit w1: T1 => TLike[El1, Repr1], w2: T2 => Iterable[El2], cbf1: CBF[Repr1, (El1, El2), To]): To = { @@ -387,7 +387,7 @@ object TupleThree extends Tuple(3) { override def imports = Tuple.zipImports override def moreMethods = """ - @deprecated("Use `zipped` instead.") + @deprecated("Use `zipped` instead.", "2.9.0") def zip[Repr1, El1, El2, El3, To](implicit w1: T1 => TLike[El1, Repr1], w2: T2 => Iterable[El2], w3: T3 => Iterable[El3], |