diff options
| author | Martin Odersky <odersky@gmail.com> | 2010-03-08 18:12:11 +0000 |
|---|---|---|
| committer | Martin Odersky <odersky@gmail.com> | 2010-03-08 18:12:11 +0000 |
| commit | b9691e331e8ffb35f42de0bee457e2440e25bb04 (patch) | |
| tree | 7edca9582beb255530c1f6fad9e955f6d0c68e14 | |
| parent | 57261cf375a8442a267b918ed582af526f8491fa (diff) | |
| download | scala-b9691e331e8ffb35f42de0bee457e2440e25bb04.tar.gz scala-b9691e331e8ffb35f42de0bee457e2440e25bb04.tar.bz2 scala-b9691e331e8ffb35f42de0bee457e2440e25bb04.zip | |
Refined fix for #2946. Review by extempore.
| -rw-r--r-- | src/compiler/scala/tools/nsc/transform/ExplicitOuter.scala | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/src/compiler/scala/tools/nsc/transform/ExplicitOuter.scala b/src/compiler/scala/tools/nsc/transform/ExplicitOuter.scala index 518602fe87..ed8a827e88 100644 --- a/src/compiler/scala/tools/nsc/transform/ExplicitOuter.scala +++ b/src/compiler/scala/tools/nsc/transform/ExplicitOuter.scala @@ -156,7 +156,7 @@ abstract class ExplicitOuter extends InfoTransform // On the other hand, mixing in the trait into a separately compiled // class needs to have a common naming scheme, independently of whether // the field was accessed from an inner class or not. See #2946 - if (sym.owner.isTrait && (sym hasFlag LOCAL)) + if (sym.owner.isTrait && (sym hasFlag LOCAL) && (sym.getter(sym.owner) == NoSymbol)) sym.makeNotPrivate(sym.owner) tp } |