diff options
author | Adriaan Moors <adriaan.moors@epfl.ch> | 2012-07-19 07:15:40 -0700 |
---|---|---|
committer | Adriaan Moors <adriaan.moors@epfl.ch> | 2012-07-19 07:15:40 -0700 |
commit | e75e862006b78d1a159c4ffb6194340492bd2de5 (patch) | |
tree | 8d5b6c155fb31348415c8f1d5e5fdcd0b80dc907 /src | |
parent | 19bea8c54eb59808b9780738c59220583ad95c60 (diff) | |
parent | 9117cbee2715ce184829a9f5b1b839240083d166 (diff) | |
download | scala-e75e862006b78d1a159c4ffb6194340492bd2de5.tar.gz scala-e75e862006b78d1a159c4ffb6194340492bd2de5.tar.bz2 scala-e75e862006b78d1a159c4ffb6194340492bd2de5.zip |
Merge pull request #919 from scalamacros/ticket/6086
SI-6086 magic symbols strike back
Diffstat (limited to 'src')
-rw-r--r-- | src/reflect/scala/reflect/runtime/JavaMirrors.scala | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/src/reflect/scala/reflect/runtime/JavaMirrors.scala b/src/reflect/scala/reflect/runtime/JavaMirrors.scala index 185621efa4..75d43a7553 100644 --- a/src/reflect/scala/reflect/runtime/JavaMirrors.scala +++ b/src/reflect/scala/reflect/runtime/JavaMirrors.scala @@ -1001,7 +1001,7 @@ trait JavaMirrors extends internal.SymbolTable with api.JavaUniverse { self: Sym private lazy val magicSymbols: Map[(String, Name), Symbol] = { def mapEntry(sym: Symbol): ((String, Name), Symbol) = (sym.owner.fullName, sym.name) -> sym - Map() ++ (definitions.magicSymbols filter (_.isClass) map mapEntry) + Map() ++ (definitions.magicSymbols filter (_.isType) map mapEntry) } /** 1. If `owner` is a package class (but not the empty package) and `name` is a term name, make a new package |