summaryrefslogtreecommitdiff
path: root/src/compiler/scala/tools/nsc/typechecker/Namers.scala
diff options
context:
space:
mode:
authorPaul Phillips <paulp@improving.org>2013-09-27 12:20:19 -0700
committerPaul Phillips <paulp@improving.org>2013-09-27 12:20:19 -0700
commit76b4810882f88a141b4445c9ce98f5afcfb80e01 (patch)
tree8ef290742814e7cadf503536ae5c386cc17835d5 /src/compiler/scala/tools/nsc/typechecker/Namers.scala
parent8ae942f7c2700aed85a481a40a8abd4fac783587 (diff)
parent9ea3a4ac2cb36ee8519deab04fd1bd6be81a89cb (diff)
downloadscala-76b4810882f88a141b4445c9ce98f5afcfb80e01.tar.gz
scala-76b4810882f88a141b4445c9ce98f5afcfb80e01.tar.bz2
scala-76b4810882f88a141b4445c9ce98f5afcfb80e01.zip
Merge pull request #2987 from paulp/pr/emptySelfType
SI-6762 rename emptyValDef to emptySelfType.
Diffstat (limited to 'src/compiler/scala/tools/nsc/typechecker/Namers.scala')
-rw-r--r--src/compiler/scala/tools/nsc/typechecker/Namers.scala2
1 files changed, 1 insertions, 1 deletions
diff --git a/src/compiler/scala/tools/nsc/typechecker/Namers.scala b/src/compiler/scala/tools/nsc/typechecker/Namers.scala
index 4cfac91a94..12e8b0a3f9 100644
--- a/src/compiler/scala/tools/nsc/typechecker/Namers.scala
+++ b/src/compiler/scala/tools/nsc/typechecker/Namers.scala
@@ -841,7 +841,7 @@ trait Namers extends MethodSynthesis {
// owner is the class with the self type
def enterSelf(self: ValDef) {
val ValDef(_, name, tpt, _) = self
- if (self eq emptyValDef)
+ if (self eq noSelfType)
return
val hasName = name != nme.WILDCARD