diff options
| author | Adriaan Moors <adriaan.moors@epfl.ch> | 2010-09-14 12:11:54 +0000 |
|---|---|---|
| committer | Adriaan Moors <adriaan.moors@epfl.ch> | 2010-09-14 12:11:54 +0000 |
| commit | 4c47e9435d8872a30f579ed451293d4772b95c31 (patch) | |
| tree | ef6b15a99abca671750bc478a2f6c8257a10d369 /src/compiler/scala/tools/nsc/typechecker/Contexts.scala | |
| parent | c40a798bf0b9ebe26385d42dbd90edc61ca0896d (diff) | |
| download | scala-4c47e9435d8872a30f579ed451293d4772b95c31.tar.gz scala-4c47e9435d8872a30f579ed451293d4772b95c31.tar.bz2 scala-4c47e9435d8872a30f579ed451293d4772b95c31.zip | |
relax implicit divergence check
patch contributed by Mark Harrah in
http://article.gmane.org/gmane.comp.lang.scala/20700
reviewed by moors and odersky
Diffstat (limited to 'src/compiler/scala/tools/nsc/typechecker/Contexts.scala')
| -rw-r--r-- | src/compiler/scala/tools/nsc/typechecker/Contexts.scala | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/src/compiler/scala/tools/nsc/typechecker/Contexts.scala b/src/compiler/scala/tools/nsc/typechecker/Contexts.scala index 42c1329edf..28c4b67db9 100644 --- a/src/compiler/scala/tools/nsc/typechecker/Contexts.scala +++ b/src/compiler/scala/tools/nsc/typechecker/Contexts.scala @@ -102,7 +102,7 @@ trait Contexts { self: Analyzer => // not inherited to child contexts var depth: Int = 0 var imports: List[ImportInfo] = List() // currently visible imports - var openImplicits: List[Type] = List() // types for which implicit arguments + var openImplicits: List[(Type,Symbol)] = List() // types for which implicit arguments // are currently searched // for a named application block (Tree) the corresponding NamedApplyInfo var namedApplyBlockInfo: Option[(Tree, NamedApplyInfo)] = None |