diff options
| author | Lukas Rytz <lukas.rytz@gmail.com> | 2015-04-01 16:52:54 +0200 |
|---|---|---|
| committer | Lukas Rytz <lukas.rytz@gmail.com> | 2015-04-01 16:52:54 +0200 |
| commit | 3aea9219c40912f1fe501be67e1a630fd595a35d (patch) | |
| tree | d6a5634dcaef14f982002fa088df1b5f7ef6b34d /src/compiler/scala/tools/nsc/typechecker/TypeDiagnostics.scala | |
| parent | 51971954ace37ad6af8bf354d92f6baf51d16324 (diff) | |
| parent | 32f520f3ed78ecde390dc7b1b48d3130e412a9dc (diff) | |
| download | scala-3aea9219c40912f1fe501be67e1a630fd595a35d.tar.gz scala-3aea9219c40912f1fe501be67e1a630fd595a35d.tar.bz2 scala-3aea9219c40912f1fe501be67e1a630fd595a35d.zip | |
Merge commit '32f520f' into merge/2.11-to-2.12-apr-1
Diffstat (limited to 'src/compiler/scala/tools/nsc/typechecker/TypeDiagnostics.scala')
| -rw-r--r-- | src/compiler/scala/tools/nsc/typechecker/TypeDiagnostics.scala | 6 |
1 files changed, 3 insertions, 3 deletions
diff --git a/src/compiler/scala/tools/nsc/typechecker/TypeDiagnostics.scala b/src/compiler/scala/tools/nsc/typechecker/TypeDiagnostics.scala index 0f90c6a478..059981aa37 100644 --- a/src/compiler/scala/tools/nsc/typechecker/TypeDiagnostics.scala +++ b/src/compiler/scala/tools/nsc/typechecker/TypeDiagnostics.scala @@ -141,8 +141,8 @@ trait TypeDiagnostics { if (!member.hasAccessorFlag) member else if (!member.isDeferred) member.accessed else { - val getter = if (member.isSetter) member.getter(member.owner) else member - val flags = if (getter.setter(member.owner) != NoSymbol) DEFERRED.toLong | MUTABLE else DEFERRED + val getter = if (member.isSetter) member.getterIn(member.owner) else member + val flags = if (getter.setterIn(member.owner) != NoSymbol) DEFERRED.toLong | MUTABLE else DEFERRED getter.owner.newValue(getter.name.toTermName, getter.pos, flags) setInfo getter.tpe.resultType } @@ -439,7 +439,7 @@ trait TypeDiagnostics { context.warning(pos, "imported `%s' is permanently hidden by definition of %s".format(hidden, defn.fullLocationString)) object checkUnused { - val ignoreNames = Set[TermName]("readResolve", "readObject", "writeObject", "writeReplace") + val ignoreNames: Set[TermName] = Set(TermName("readResolve"), TermName("readObject"), TermName("writeObject"), TermName("writeReplace")) class UnusedPrivates extends Traverser { val defnTrees = ListBuffer[MemberDef]() |