diff options
author | Adriaan Moors <adriaan.moors@typesafe.com> | 2013-02-08 16:43:26 -0800 |
---|---|---|
committer | Adriaan Moors <adriaan.moors@typesafe.com> | 2013-02-09 18:11:10 -0800 |
commit | 549a1fea9366af0c0a4697bc39e3a75bd8f066f5 (patch) | |
tree | 95ac5fdee65b9cb20ec46c076d752603ef036abc | |
parent | 5d487f105f1f2890506c3e99e352a02f206fad83 (diff) | |
download | scala-549a1fea9366af0c0a4697bc39e3a75bd8f066f5.tar.gz scala-549a1fea9366af0c0a4697bc39e3a75bd8f066f5.tar.bz2 scala-549a1fea9366af0c0a4697bc39e3a75bd8f066f5.zip |
[nomaster] bring back SerializeStart from fa3b8040eb
This is necessary to maintain binary compatibility with 2.10.0.
-rw-r--r-- | bincompat-backward.whitelist.conf | 20 | ||||
-rw-r--r-- | src/library/scala/collection/immutable/List.scala | 4 |
2 files changed, 14 insertions, 10 deletions
diff --git a/bincompat-backward.whitelist.conf b/bincompat-backward.whitelist.conf index 07f459c922..7baecc63a0 100644 --- a/bincompat-backward.whitelist.conf +++ b/bincompat-backward.whitelist.conf @@ -11,16 +11,16 @@ filter { matchName="scala.collection.immutable.Stream.scala$collection$immutable$Stream$$loop$5" problemName=MissingMethodProblem }, - { - # private[scala] - matchName="scala.collection.immutable.ListSerializeStart$" - problemName=MissingClassProblem - }, - { - # private[scala] - matchName="scala.collection.immutable.ListSerializeStart" - problemName=MissingClassProblem - }, + # { + # # private[scala] + # matchName="scala.collection.immutable.ListSerializeStart$" + # problemName=MissingClassProblem + # }, + # { + # # private[scala] + # matchName="scala.collection.immutable.ListSerializeStart" + # problemName=MissingClassProblem + # }, { # private nested class became private top-level class to fix SI-7018 matchName="scala.reflect.macros.Attachments$NonemptyAttachments" diff --git a/src/library/scala/collection/immutable/List.scala b/src/library/scala/collection/immutable/List.scala index 9765e7c52f..2d6952ff92 100644 --- a/src/library/scala/collection/immutable/List.scala +++ b/src/library/scala/collection/immutable/List.scala @@ -643,6 +643,10 @@ object List extends SeqFactory[List] { } /** Only used for list serialization */ +@SerialVersionUID(0L - 8287891243975527522L) +private[scala] case object ListSerializeStart + +/** Only used for list serialization */ @SerialVersionUID(0L - 8476791151975527571L) private[scala] case object ListSerializeEnd |