From 526c92848af4b4b1647d7400aab2296fba6752d2 Mon Sep 17 00:00:00 2001 From: Paul Phillips Date: Sun, 19 Feb 2012 12:51:25 -0800 Subject: Specialize Tuple2 on more types. This one is a no-brainer now. --- src/build/genprod.scala | 2 +- src/library/scala/Tuple2.scala | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) (limited to 'src') diff --git a/src/build/genprod.scala b/src/build/genprod.scala index a43b5e02c7..cce00321df 100644 --- a/src/build/genprod.scala +++ b/src/build/genprod.scala @@ -277,7 +277,7 @@ object TupleOne extends Tuple(1) object TupleTwo extends Tuple(2) { override def imports = Tuple.zipImports - override def covariantSpecs = "@specialized(Int, Long, Double) " + override def covariantSpecs = "@specialized(Int, Long, Double, Char, Boolean, AnyRef) " override def moreMethods = """ /** Swaps the elements of this `Tuple`. * @return a new Tuple where the first element is the second element of this Tuple and the diff --git a/src/library/scala/Tuple2.scala b/src/library/scala/Tuple2.scala index ad3f7df697..b1befca4fa 100644 --- a/src/library/scala/Tuple2.scala +++ b/src/library/scala/Tuple2.scala @@ -19,7 +19,7 @@ import scala.collection.generic.{ CanBuildFrom => CBF } * @param _1 Element 1 of this Tuple2 * @param _2 Element 2 of this Tuple2 */ -case class Tuple2[@specialized(Int, Long, Double) +T1, @specialized(Int, Long, Double) +T2](_1: T1, _2: T2) +case class Tuple2[@specialized(Int, Long, Double, Char, Boolean, AnyRef) +T1, @specialized(Int, Long, Double, Char, Boolean, AnyRef) +T2](_1: T1, _2: T2) extends Product2[T1, T2] { override def toString() = "(" + _1 + "," + _2 + ")" -- cgit v1.2.3