summaryrefslogtreecommitdiff
path: root/src
diff options
context:
space:
mode:
authorMartin Odersky <odersky@gmail.com>2012-03-06 21:37:32 +0100
committerMartin Odersky <odersky@gmail.com>2012-03-06 21:37:32 +0100
commit1d23ea6bf792651928d21a36287b0acccda4f91a (patch)
treeb52b1998e2916637f532d3aef81c10d52d4da411 /src
parent1e9277689461452c594dc547dc0b0ceab8cd3e7d (diff)
downloadscala-1d23ea6bf792651928d21a36287b0acccda4f91a.tar.gz
scala-1d23ea6bf792651928d21a36287b0acccda4f91a.tar.bz2
scala-1d23ea6bf792651928d21a36287b0acccda4f91a.zip
Make scala.io.Serializable a universal trait.
Diffstat (limited to 'src')
-rw-r--r--src/compiler/scala/reflect/internal/Definitions.scala5
1 files changed, 3 insertions, 2 deletions
diff --git a/src/compiler/scala/reflect/internal/Definitions.scala b/src/compiler/scala/reflect/internal/Definitions.scala
index 1b3ef2ed66..570a6caf02 100644
--- a/src/compiler/scala/reflect/internal/Definitions.scala
+++ b/src/compiler/scala/reflect/internal/Definitions.scala
@@ -333,7 +333,7 @@ trait Definitions extends reflect.api.StandardDefinitions {
lazy val TypeConstraintClass = getRequiredClass("scala.annotation.TypeConstraint")
lazy val SingletonClass = enterNewClass(ScalaPackageClass, tpnme.Singleton, anyparam, ABSTRACT | TRAIT | FINAL)
lazy val SerializableClass = getRequiredClass("scala.Serializable")
- lazy val JavaSerializableClass = getClass(sn.JavaSerializable)
+ lazy val JavaSerializableClass = getClass(sn.JavaSerializable) modifyInfo fixupAsAnyTrait
lazy val ComparableClass = getRequiredClass("java.lang.Comparable") modifyInfo fixupAsAnyTrait
lazy val JavaCloneableClass = getRequiredClass("java.lang.Cloneable")
lazy val RemoteInterfaceClass = getRequiredClass("java.rmi.Remote")
@@ -1071,7 +1071,8 @@ trait Definitions extends reflect.api.StandardDefinitions {
Object_isInstanceOf,
Object_asInstanceOf,
String_+,
- ComparableClass
+ ComparableClass,
+ JavaSerializableClass
)
isInitialized = true