diff options
| author | eldritch horrors <pennae@lix.systems> | 2024-03-08 09:52:29 +0100 |
|---|---|---|
| committer | eldritch horrors <pennae@lix.systems> | 2024-03-10 03:18:32 -0600 |
| commit | 06764118ea1327973ead981ee204e8c0c2bf867e (patch) | |
| tree | 82b9703980a4e28a2dd0638d10d2729f334076cc /src/libexpr/parser-state.hh | |
| parent | b667b4cded1b9d974157f27761d8648b372d27bf (diff) | |
remove ExprAttrs::AttrDef::inherited
it's no longer widely used and has a rather confusing meaning now that
inherit-from is handled very differently.
(cherry picked from commit 1cd87b7042d14aae1fafa47b1c28db4c5bd20de7)
Change-Id: I90bbebddf06762960d8ca4f621cf042ce8ae83f9
Diffstat (limited to 'src/libexpr/parser-state.hh')
| -rw-r--r-- | src/libexpr/parser-state.hh | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/src/libexpr/parser-state.hh b/src/libexpr/parser-state.hh index d10188f52..a83d8c8b2 100644 --- a/src/libexpr/parser-state.hh +++ b/src/libexpr/parser-state.hh @@ -88,7 +88,7 @@ inline void ParserState::addAttr(ExprAttrs * attrs, AttrPath && attrPath, Expr * if (i->symbol) { ExprAttrs::AttrDefs::iterator j = attrs->attrs.find(i->symbol); if (j != attrs->attrs.end()) { - if (!j->second.inherited()) { + if (j->second.kind != ExprAttrs::AttrDef::Kind::Inherited) { ExprAttrs * attrs2 = dynamic_cast<ExprAttrs *>(j->second.e); if (!attrs2) dupAttr(attrPath, pos, j->second.pos); attrs = attrs2; |