diff options
| author | Martin Odersky <odersky@gmail.com> | 2010-03-24 14:29:04 +0000 |
|---|---|---|
| committer | Martin Odersky <odersky@gmail.com> | 2010-03-24 14:29:04 +0000 |
| commit | c21980c483ff2c95278bc9de40cb1f2e3375e6fe (patch) | |
| tree | 2756f2d5d67ae24af197eaade19d578fdca8aa81 /src/library | |
| parent | 98cb7ad7c444919916a6d882f41378ecde269a9b (diff) | |
| download | scala-c21980c483ff2c95278bc9de40cb1f2e3375e6fe.tar.gz scala-c21980c483ff2c95278bc9de40cb1f2e3375e6fe.tar.bz2 scala-c21980c483ff2c95278bc9de40cb1f2e3375e6fe.zip | |
Fixes problematic equality of Enumeration values.
Diffstat (limited to 'src/library')
| -rw-r--r-- | src/library/scala/Enumeration.scala | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/src/library/scala/Enumeration.scala b/src/library/scala/Enumeration.scala index 09504046ea..1346f4f469 100644 --- a/src/library/scala/Enumeration.scala +++ b/src/library/scala/Enumeration.scala @@ -65,7 +65,7 @@ private object Enumeration { */ @serializable @SerialVersionUID(8476000850333817230L) -abstract class Enumeration(initial: Int, names: String*) { +abstract class Enumeration(initial: Int, names: String*) { thisenum => def this() = this(0, null) def this(names: String*) = this(0, names: _*) @@ -228,7 +228,7 @@ abstract class Enumeration(initial: Int, names: String*) { override def compare(that: Value): Int = this.id - that.id override def equals(other: Any): Boolean = other match { - case that: Value => compare(that) == 0 + case that: thisenum.Value => compare(that) == 0 case _ => false } override def hashCode: Int = id.hashCode |