From 549a1fea9366af0c0a4697bc39e3a75bd8f066f5 Mon Sep 17 00:00:00 2001 From: Adriaan Moors Date: Fri, 8 Feb 2013 16:43:26 -0800 Subject: [PATCH] [nomaster] bring back SerializeStart from fa3b8040eb This is necessary to maintain binary compatibility with 2.10.0. --- bincompat-backward.whitelist.conf | 20 +++++++++---------- .../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 07f459c9220b..7baecc63a04e 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 9765e7c52fe9..2d6952ff92d9 100644 --- a/src/library/scala/collection/immutable/List.scala +++ b/src/library/scala/collection/immutable/List.scala @@ -642,6 +642,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