diff options
| author | Araq <rumpf_a@web.de> | 2018-08-23 11:30:55 +0200 |
|---|---|---|
| committer | Araq <rumpf_a@web.de> | 2018-08-23 11:30:55 +0200 |
| commit | 30597e643fe8818ef1bb6cc93a5c573f92a28ea9 (patch) | |
| tree | ea6de7aabdbfc5db583e2dfbaf9f792c8240a63e /compiler/sigmatch.nim | |
| parent | cb9e9297fba72c812913376311ca4b7ebd7e007f (diff) | |
| parent | 55a86497491586dc1b5ad2f6303d53992b999ab5 (diff) | |
| download | Nim-30597e643fe8818ef1bb6cc93a5c573f92a28ea9.tar.gz | |
fixes merge conflict
Diffstat (limited to 'compiler/sigmatch.nim')
| -rw-r--r-- | compiler/sigmatch.nim | 3 |
1 files changed, 2 insertions, 1 deletions
diff --git a/compiler/sigmatch.nim b/compiler/sigmatch.nim index f206119ec..932163055 100644 --- a/compiler/sigmatch.nim +++ b/compiler/sigmatch.nim @@ -993,7 +993,8 @@ proc typeRelImpl(c: var TCandidate, f, aOrig: PType, useTypeLoweringRuleInTypeClass = c.c.matchedConcept != nil and not c.isNoCall and f.kind != tyTypeDesc and - tfExplicit notin aOrig.flags + tfExplicit notin aOrig.flags and + tfConceptMatchedTypeSym notin aOrig.flags aOrig = if useTypeLoweringRuleInTypeClass: aOrig.skipTypes({tyTypeDesc}) |