diff options
| author | Adriaan Moors <adriaan.moors@epfl.ch> | 2010-09-14 14:23:28 +0000 |
|---|---|---|
| committer | Adriaan Moors <adriaan.moors@epfl.ch> | 2010-09-14 14:23:28 +0000 |
| commit | 3b8129c77b9426a621163d4e5bf54943f58692a1 (patch) | |
| tree | cfd3a9c7c28b0b135bd06d65275803770e5b99f5 /src/compiler/scala/tools/nsc/typechecker/Contexts.scala | |
| parent | 45b659cd413a1411c90cd27261d8260229f93898 (diff) | |
| download | scala-3b8129c77b9426a621163d4e5bf54943f58692a1.tar.gz scala-3b8129c77b9426a621163d4e5bf54943f58692a1.tar.bz2 scala-3b8129c77b9426a621163d4e5bf54943f58692a1.zip | |
closes #1693: improve implicit conversion disam...
closes #1693: improve implicit conversion disambiguation by
incorporating the expected type of the member that triggered the
conversion
back-ported fix by Martin in embeddings branch.
review by odersky (just in case it shouldn't have been back-ported)
Diffstat (limited to 'src/compiler/scala/tools/nsc/typechecker/Contexts.scala')
| -rw-r--r-- | src/compiler/scala/tools/nsc/typechecker/Contexts.scala | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/src/compiler/scala/tools/nsc/typechecker/Contexts.scala b/src/compiler/scala/tools/nsc/typechecker/Contexts.scala index 28c4b67db9..900f7e471b 100644 --- a/src/compiler/scala/tools/nsc/typechecker/Contexts.scala +++ b/src/compiler/scala/tools/nsc/typechecker/Contexts.scala @@ -214,8 +214,8 @@ trait Contexts { self: Analyzer => def make(tree: Tree): Context = make(tree, owner) - def makeSilent(reportAmbiguousErrors: Boolean): Context = { - val c = make(tree) + def makeSilent(reportAmbiguousErrors: Boolean, newtree: Tree = tree): Context = { + val c = make(newtree) c.reportGeneralErrors = false c.reportAmbiguousErrors = reportAmbiguousErrors c |