diff options
| author | Lukas Rytz <lukas.rytz@typesafe.com> | 2014-11-07 08:31:13 +0100 |
|---|---|---|
| committer | Lukas Rytz <lukas.rytz@typesafe.com> | 2014-11-07 08:31:13 +0100 |
| commit | 838ff2c2f256d1c114a406ff1032be92a3d3dac6 (patch) | |
| tree | d5797c7dca80d4d45edd8ca043414f3162994899 /src/library/scala/Option.scala | |
| parent | ecdac378c4d38f3e2c8317b7023819d3d8c2f0c3 (diff) | |
| parent | 1eaf795aa49e5555c2ab608edea1b78c0bec8322 (diff) | |
| download | scala-838ff2c2f256d1c114a406ff1032be92a3d3dac6.tar.gz scala-838ff2c2f256d1c114a406ff1032be92a3d3dac6.tar.bz2 scala-838ff2c2f256d1c114a406ff1032be92a3d3dac6.zip | |
Merge pull request #4047 from lrytz/delambda-method-tests
Fix tests under -Ydelambdafy:method
Diffstat (limited to 'src/library/scala/Option.scala')
| -rw-r--r-- | src/library/scala/Option.scala | 3 |
1 files changed, 3 insertions, 0 deletions
diff --git a/src/library/scala/Option.scala b/src/library/scala/Option.scala index 86dbffab92..41224f4c6c 100644 --- a/src/library/scala/Option.scala +++ b/src/library/scala/Option.scala @@ -94,6 +94,7 @@ object Option { * @define bfinfo an implicit value of class `CanBuildFrom` which determines the result class `That` from the current * representation type `Repr` and the new element type `B`. */ +@SerialVersionUID(-114498752079829388L) // value computed by serialver for 2.11.2, annotation added in 2.11.4 sealed abstract class Option[+A] extends Product with Serializable { self => @@ -328,6 +329,7 @@ sealed abstract class Option[+A] extends Product with Serializable { * @author Martin Odersky * @version 1.0, 16/07/2003 */ +@SerialVersionUID(1234815782226070388L) // value computed by serialver for 2.11.2, annotation added in 2.11.4 final case class Some[+A](x: A) extends Option[A] { def isEmpty = false def get = x @@ -339,6 +341,7 @@ final case class Some[+A](x: A) extends Option[A] { * @author Martin Odersky * @version 1.0, 16/07/2003 */ +@SerialVersionUID(5066590221178148012L) // value computed by serialver for 2.11.2, annotation added in 2.11.4 case object None extends Option[Nothing] { def isEmpty = true def get = throw new NoSuchElementException("None.get") |