diff options
| author | Miles Sabin <miles@milessabin.com> | 2010-01-10 12:08:40 +0000 |
|---|---|---|
| committer | Miles Sabin <miles@milessabin.com> | 2010-01-10 12:08:40 +0000 |
| commit | dab6222b273e97934a7783aabd7717845f32db88 (patch) | |
| tree | 4ff8d4b5f6965597ebbcc79286a183f3c36f06df /src | |
| parent | c63a27103414915998d52d99655c20fe0f81a721 (diff) | |
| download | scala-dab6222b273e97934a7783aabd7717845f32db88.tar.gz scala-dab6222b273e97934a7783aabd7717845f32db88.tar.bz2 scala-dab6222b273e97934a7783aabd7717845f32db88.zip | |
Weaken the test for co-definition to equality o...
Weaken the test for co-definition to equality of paths (equality of
files fails where implementing types differ). Review by odersky.
Diffstat (limited to 'src')
| -rw-r--r-- | src/compiler/scala/tools/nsc/symtab/Symbols.scala | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/src/compiler/scala/tools/nsc/symtab/Symbols.scala b/src/compiler/scala/tools/nsc/symtab/Symbols.scala index 9f22bc54f7..85ed3a786f 100644 --- a/src/compiler/scala/tools/nsc/symtab/Symbols.scala +++ b/src/compiler/scala/tools/nsc/symtab/Symbols.scala @@ -1238,7 +1238,7 @@ trait Symbols { // appears to succeed but highly opaque errors come later: see bug #1286 if (res == false) { val (f1, f2) = (this.sourceFile, that.sourceFile) - if (f1 != null && f2 != null && f1 != f2) + if (f1 != null && f2 != null && f1.path != f2.path) throw FatalError("Companions '" + this + "' and '" + that + "' must be defined in same file.") } |