diff options
author | Stefan Zeiger <szeiger@novocode.com> | 2016-08-12 19:52:38 +0200 |
---|---|---|
committer | GitHub <noreply@github.com> | 2016-08-12 19:52:38 +0200 |
commit | f026be2b89fc802b1064607942a40344a4c198cd (patch) | |
tree | 6ce14f8a3429559cca134532b0d6067d2c7ad8cf | |
parent | 18bdbc83e1ac9baafbf18940ad1b87e4122fc978 (diff) | |
parent | 4c2c4c17bedb0627f6caaa44b0ab4c58a8949b71 (diff) | |
download | scala-f026be2b89fc802b1064607942a40344a4c198cd.tar.gz scala-f026be2b89fc802b1064607942a40344a4c198cd.tar.bz2 scala-f026be2b89fc802b1064607942a40344a4c198cd.zip |
Merge pull request #5306 from szeiger/issue/8576
SI-8576 Minimal changes for `-Xcheckinit` compatibility
-rw-r--r-- | src/library/scala/collection/immutable/Vector.scala | 1 | ||||
-rw-r--r-- | src/repl/scala/tools/nsc/interpreter/PresentationCompilation.scala | 2 |
2 files changed, 2 insertions, 1 deletions
diff --git a/src/library/scala/collection/immutable/Vector.scala b/src/library/scala/collection/immutable/Vector.scala index 539ae9c387..d8c422c700 100644 --- a/src/library/scala/collection/immutable/Vector.scala +++ b/src/library/scala/collection/immutable/Vector.scala @@ -59,6 +59,7 @@ object Vector extends IndexedSeqFactory[Vector] { * @define mayNotTerminateInf * @define willNotTerminateInf */ +@SerialVersionUID(-1334388273712300479L) final class Vector[+A] private[immutable] (private[collection] val startIndex: Int, private[collection] val endIndex: Int, focus: Int) extends AbstractSeq[A] with IndexedSeq[A] diff --git a/src/repl/scala/tools/nsc/interpreter/PresentationCompilation.scala b/src/repl/scala/tools/nsc/interpreter/PresentationCompilation.scala index b9a4054ffc..d675563bc9 100644 --- a/src/repl/scala/tools/nsc/interpreter/PresentationCompilation.scala +++ b/src/repl/scala/tools/nsc/interpreter/PresentationCompilation.scala @@ -69,7 +69,7 @@ trait PresentationCompilation { val interactiveGlobal = new interactive.Global(copySettings, storeReporter) { self => override lazy val platform: ThisPlatform = { new JavaPlatform { - val global: self.type = self + lazy val global: self.type = self override private[nsc] lazy val classPath: ClassPath = mergedFlatClasspath } } |