aboutsummaryrefslogtreecommitdiff
path: root/src/dotty/tools/dotc/typer/Typer.scala
diff options
context:
space:
mode:
authorGuillaume Martres <smarter@ubuntu.com>2015-10-30 18:32:47 +0900
committerGuillaume Martres <smarter@ubuntu.com>2015-10-30 18:32:47 +0900
commitedfb6e72076b216c4762b52a5b9558fd9d106148 (patch)
tree2b8d79b296ce5c8bc56dcb831e6b324a0330748d /src/dotty/tools/dotc/typer/Typer.scala
parent201ce2f1d11bf3940291f6c800ec9dedead6c2a5 (diff)
parent4f9b5cc0b785e8a4e5375407b695278fecb94588 (diff)
downloaddotty-edfb6e72076b216c4762b52a5b9558fd9d106148.tar.gz
dotty-edfb6e72076b216c4762b52a5b9558fd9d106148.tar.bz2
dotty-edfb6e72076b216c4762b52a5b9558fd9d106148.zip
Merge pull request #886 from dotty-staging/fix-#884
Fix #884 - misdiagnosed ambiguous definition.
Diffstat (limited to 'src/dotty/tools/dotc/typer/Typer.scala')
-rw-r--r--src/dotty/tools/dotc/typer/Typer.scala2
1 files changed, 1 insertions, 1 deletions
diff --git a/src/dotty/tools/dotc/typer/Typer.scala b/src/dotty/tools/dotc/typer/Typer.scala
index 52ea32bbc..3ca728895 100644
--- a/src/dotty/tools/dotc/typer/Typer.scala
+++ b/src/dotty/tools/dotc/typer/Typer.scala
@@ -200,7 +200,7 @@ class Typer extends Namer with TypeAssigner with Applications with Implicits wit
*/
def isDefinedInCurrentUnit(denot: Denotation): Boolean = denot match {
case MultiDenotation(d1, d2) => isDefinedInCurrentUnit(d1) || isDefinedInCurrentUnit(d2)
- case denot: SingleDenotation => denot.symbol.sourceFile == ctx.source
+ case denot: SingleDenotation => denot.symbol.sourceFile == ctx.source.file
}
/** Is `denot` the denotation of a self symbol? */