summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorPaul Phillips <paulp@improving.org>2011-01-10 19:20:24 +0000
committerPaul Phillips <paulp@improving.org>2011-01-10 19:20:24 +0000
commit2230bc9f7b6f19f0a76adf130c1779739543c4f7 (patch)
tree128a2f89d08a1b61ec27cb1d5b0955429b6866ca
parent75371b41dbdbc43d10f7a630a7b7babd1c0aa921 (diff)
downloadscala-2230bc9f7b6f19f0a76adf130c1779739543c4f7.tar.gz
scala-2230bc9f7b6f19f0a76adf130c1779739543c4f7.tar.bz2
scala-2230bc9f7b6f19f0a76adf130c1779739543c4f7.zip
Made <:< and =:= serializable.
-rw-r--r--src/library/scala/Predef.scala6
1 files changed, 3 insertions, 3 deletions
diff --git a/src/library/scala/Predef.scala b/src/library/scala/Predef.scala
index d7bd88a88d..e8768fd150 100644
--- a/src/library/scala/Predef.scala
+++ b/src/library/scala/Predef.scala
@@ -340,7 +340,7 @@ object Predef extends LowPriorityImplicits {
* simply add an implicit argument of type `T <:< U`, where U is the required upper bound (for lower-bounds, use: `U <: T`)
* in part contributed by Jason Zaugg
*/
- sealed abstract class <:<[-From, +To] extends (From => To)
+ sealed abstract class <:<[-From, +To] extends (From => To) with Serializable
implicit def conforms[A]: A <:< A = new (A <:< A) { def apply(x: A) = x }
// not in the <:< companion object because it is also intended to subsume identity (which is no longer implicit)
@@ -348,14 +348,14 @@ object Predef extends LowPriorityImplicits {
*
* @see <:< for expressing subtyping constraints
*/
- sealed abstract class =:=[From, To] extends (From => To)
+ sealed abstract class =:=[From, To] extends (From => To) with Serializable
object =:= {
implicit def tpEquals[A]: A =:= A = new (A =:= A) {def apply(x: A) = x}
}
// less useful due to #2781
@deprecated("Use From => To instead")
- sealed abstract class <%<[-From, +To] extends (From => To)
+ sealed abstract class <%<[-From, +To] extends (From => To) with Serializable
object <%< {
implicit def conformsOrViewsAs[A <% B, B]: A <%< B = new (A <%< B) {def apply(x: A) = x}
}