diff options
author | Iulian Dragos <jaguarul@gmail.com> | 2009-10-24 17:01:34 +0000 |
---|---|---|
committer | Iulian Dragos <jaguarul@gmail.com> | 2009-10-24 17:01:34 +0000 |
commit | 460a434698ec97cd3dfb74a18d45ab08ea95debc (patch) | |
tree | 25eb0d9bcb123ca6c20613281f9b019820b1f41f | |
parent | d9132250423429dd47a36e2a7b2db691128bd152 (diff) | |
download | scala-460a434698ec97cd3dfb74a18d45ab08ea95debc.tar.gz scala-460a434698ec97cd3dfb74a18d45ab08ea95debc.tar.bz2 scala-460a434698ec97cd3dfb74a18d45ab08ea95debc.zip |
Fixed isCoDefinedWith by undoing previous changes.
-rw-r--r-- | src/compiler/scala/tools/nsc/symtab/Symbols.scala | 3 |
1 files changed, 2 insertions, 1 deletions
diff --git a/src/compiler/scala/tools/nsc/symtab/Symbols.scala b/src/compiler/scala/tools/nsc/symtab/Symbols.scala index a781971670..e86420de51 100644 --- a/src/compiler/scala/tools/nsc/symtab/Symbols.scala +++ b/src/compiler/scala/tools/nsc/symtab/Symbols.scala @@ -1208,7 +1208,8 @@ trait Symbols { (this.rawInfo ne NoType) && { val res = !this.owner.isPackageClass || - ((this.sourceFile eq null) && (that.sourceFile eq null)) || + (this.sourceFile eq null) || + (that.sourceFile eq null) || (this.sourceFile eq that.sourceFile) || (this.sourceFile == that.sourceFile) |