diff options
author | Paul Phillips <paulp@improving.org> | 2012-05-14 16:01:26 -0700 |
---|---|---|
committer | Paul Phillips <paulp@improving.org> | 2012-05-14 16:01:38 -0700 |
commit | 5963be026e32a3cf391939f333d45d0dd40edfb3 (patch) | |
tree | 61575c7a398df7d862f2f8f601f720c2e67f2cd7 /src/compiler | |
parent | 0d51e856618ab32f454913ce522df9940fff9726 (diff) | |
download | scala-5963be026e32a3cf391939f333d45d0dd40edfb3.tar.gz scala-5963be026e32a3cf391939f333d45d0dd40edfb3.tar.bz2 scala-5963be026e32a3cf391939f333d45d0dd40edfb3.zip |
Tweak to avoid value classes in modifier check.
Diffstat (limited to 'src/compiler')
-rw-r--r-- | src/compiler/scala/tools/nsc/typechecker/Namers.scala | 2 |
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 7118436413..2f2278251b 100644 --- a/src/compiler/scala/tools/nsc/typechecker/Namers.scala +++ b/src/compiler/scala/tools/nsc/typechecker/Namers.scala @@ -1423,7 +1423,7 @@ trait Namers extends MethodSynthesis { fail(LazyAndEarlyInit) if (sym.info.typeSymbol == FunctionClass(0) && sym.isValueParameter && sym.owner.isCaseClass) fail(ByNameParameter) - if (sym.isTrait && sym.isFinal) + if (sym.isTrait && sym.isFinal && !sym.isSubClass(AnyValClass)) checkNoConflict(ABSTRACT, FINAL) if (sym.isDeferred) { |