diff options
| author | Adriaan Moors <adriaan.moors@epfl.ch> | 2012-05-22 15:52:08 -0700 |
|---|---|---|
| committer | Adriaan Moors <adriaan.moors@epfl.ch> | 2012-05-22 15:52:08 -0700 |
| commit | 9dae0deb1cd5d1f0cdc81d45a2b681a65a709b0d (patch) | |
| tree | 706a5f54499cd158cae4f66a2a4106135e6d1fda /src | |
| parent | 7248c079247d2949f3a12c1da60ac51747bda9ff (diff) | |
| parent | 03e6d929ee639de292daa778dde514e1b7014eac (diff) | |
| download | scala-9dae0deb1cd5d1f0cdc81d45a2b681a65a709b0d.tar.gz scala-9dae0deb1cd5d1f0cdc81d45a2b681a65a709b0d.tar.bz2 scala-9dae0deb1cd5d1f0cdc81d45a2b681a65a709b0d.zip | |
Merge pull request #592 from retronym/ticket/4975
Consider method-scoped companions in the implicit scope.
Diffstat (limited to 'src')
| -rw-r--r-- | src/compiler/scala/tools/nsc/typechecker/Implicits.scala | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/src/compiler/scala/tools/nsc/typechecker/Implicits.scala b/src/compiler/scala/tools/nsc/typechecker/Implicits.scala index b2d373593f..a671b8d6b5 100644 --- a/src/compiler/scala/tools/nsc/typechecker/Implicits.scala +++ b/src/compiler/scala/tools/nsc/typechecker/Implicits.scala @@ -933,7 +933,7 @@ trait Implicits { } case None => if (pre.isStable) { - val companion = sym.companionModule + val companion = companionSymbolOf(sym, context) companion.moduleClass match { case mc: ModuleClassSymbol => val infos = |