summaryrefslogtreecommitdiff
path: root/src
diff options
context:
space:
mode:
authorMartin Odersky <odersky@gmail.com>2006-04-28 17:23:53 +0000
committerMartin Odersky <odersky@gmail.com>2006-04-28 17:23:53 +0000
commit2c7b0f4cedeb9d011079e7404d2ae44e7b428c99 (patch)
treef14f057706a2e4aff40e7ac63b5a1b446da730b0 /src
parent62fb3c42e4c5a73e40f28b66be24976205283390 (diff)
downloadscala-2c7b0f4cedeb9d011079e7404d2ae44e7b428c99.tar.gz
scala-2c7b0f4cedeb9d011079e7404d2ae44e7b428c99.tar.bz2
scala-2c7b0f4cedeb9d011079e7404d2ae44e7b428c99.zip
fixed bug 581
Diffstat (limited to 'src')
-rw-r--r--src/compiler/scala/tools/nsc/transform/OverridingPairs.scala2
1 files changed, 1 insertions, 1 deletions
diff --git a/src/compiler/scala/tools/nsc/transform/OverridingPairs.scala b/src/compiler/scala/tools/nsc/transform/OverridingPairs.scala
index 2f80216dbe..fc3aaacaef 100644
--- a/src/compiler/scala/tools/nsc/transform/OverridingPairs.scala
+++ b/src/compiler/scala/tools/nsc/transform/OverridingPairs.scala
@@ -103,8 +103,8 @@ abstract class OverridingPairs {
} while (nextEntry != null &&
((nextEntry.sym hasFlag PRIVATE) ||
(overriding.owner == nextEntry.sym.owner) ||
- (hasCommonParent(overriding, nextEntry.sym)) ||
(!matches(overriding, nextEntry.sym)) ||
+ (hasCommonParent(overriding, nextEntry.sym)) ||
(overriding hasFlag LOCAL)))
}
if (nextEntry != null) {