diff options
| author | Iulian Dragos <jaguarul@gmail.com> | 2010-06-11 13:57:25 +0000 |
|---|---|---|
| committer | Iulian Dragos <jaguarul@gmail.com> | 2010-06-11 13:57:25 +0000 |
| commit | 7bbfc884cb705197e53681f001b6800479995259 (patch) | |
| tree | a2cf1b774d5aec7f8a9f506fb0acd7e6cb14b959 | |
| parent | c539f3fa95c19393e01ef83a18f93d05793817e8 (diff) | |
| download | scala-7bbfc884cb705197e53681f001b6800479995259.tar.gz scala-7bbfc884cb705197e53681f001b6800479995259.tar.bz2 scala-7bbfc884cb705197e53681f001b6800479995259.zip | |
Merged revisions 22227 via svnmerge from
https://lampsvn.epfl.ch/svn-repos/scala/scala/trunk
........
r22227 | dragos | 2010-06-11 15:56:20 +0200 (Fri, 11 Jun 2010) | 1 line
Fixed the broken build.
........
| -rw-r--r-- | src/compiler/scala/tools/nsc/typechecker/SuperAccessors.scala | 3 |
1 files changed, 2 insertions, 1 deletions
diff --git a/src/compiler/scala/tools/nsc/typechecker/SuperAccessors.scala b/src/compiler/scala/tools/nsc/typechecker/SuperAccessors.scala index 0c3ac481ed..82cfac5ad8 100644 --- a/src/compiler/scala/tools/nsc/typechecker/SuperAccessors.scala +++ b/src/compiler/scala/tools/nsc/typechecker/SuperAccessors.scala @@ -418,6 +418,7 @@ abstract class SuperAccessors extends transform.Transform with transform.TypingT val res = /* settings.debug.value && */ ((sym hasFlag PROTECTED) + && sym.hasFlag(JAVA) && !sym.owner.isPackageClass && !accessibleThroughSubclassing && (enclPackage(sym.owner) != enclPackage(currentOwner)) @@ -431,7 +432,7 @@ abstract class SuperAccessors extends transform.Transform with transform.TypingT if (host.thisSym.tpe.typeSymbol.hasFlag(JAVA)) errorRestriction("%s accesses protected %s from self type %s.".format(currentOwner.enclClass, sym, host.thisSym.tpe)) false - } else if (host.isTrait && sym.hasFlag(JAVA)) { + } else if (host.isTrait && sym.hasFlag(JAVA)) { vm errorRestriction(("%s accesses protected %s inside a concrete trait method. " + "Add an accessor in a class extending %s to work around this bug.").format(currentOwner.enclClass, sym, sym.enclClass)) false |