diff options
| author | Iain Buclaw <ibuclaw@gdcproject.org> | 2020-06-05 11:37:47 +0200 |
|---|---|---|
| committer | Iain Buclaw <ibuclaw@gdcproject.org> | 2020-06-05 12:29:47 +0200 |
| commit | d3da83f66f13d371f8bb73443fed32d5c820484d (patch) | |
| tree | 2455b1d0f737e396e800dabbaa653a42bb162005 /gcc/d/dmd/attrib.h | |
| parent | 9758d196f57950ea89baa5cdf6ebd7125b5056e0 (diff) | |
| download | gcc-d3da83f66f13d371f8bb73443fed32d5c820484d.zip gcc-d3da83f66f13d371f8bb73443fed32d5c820484d.tar.gz gcc-d3da83f66f13d371f8bb73443fed32d5c820484d.tar.bz2 | |
d: Merge upstream dmd 6d5bffa54
Removes an unused parameter from Condition::include(), all callers have
been updated in the front-end.
Reviewed-on: https://github.com/dlang/dmd/pull/11229
gcc/d/ChangeLog:
* dmd/MERGE: Merge upstream dmd 6d5bffa54.
* d-builtins.cc (maybe_set_builtin_1): Update call to
Condition::include().
* decl.cc (DeclVisitor::visit(AttribDeclaration *)): Likewise.
* types.cc (layout_aggregate_members): Likewise.
Diffstat (limited to 'gcc/d/dmd/attrib.h')
| -rw-r--r-- | gcc/d/dmd/attrib.h | 8 |
1 files changed, 4 insertions, 4 deletions
diff --git a/gcc/d/dmd/attrib.h b/gcc/d/dmd/attrib.h index b7432e0..a20e96b 100644 --- a/gcc/d/dmd/attrib.h +++ b/gcc/d/dmd/attrib.h @@ -28,7 +28,7 @@ public: Dsymbols *decl; // array of Dsymbol's AttribDeclaration(Dsymbols *decl); - virtual Dsymbols *include(Scope *sc, ScopeDsymbol *sds); + virtual Dsymbols *include(Scope *sc); int apply(Dsymbol_apply_ft_t fp, void *param); static Scope *createNewScope(Scope *sc, StorageClass newstc, LINK linkage, CPPMANGLE cppmangle, Prot protection, @@ -180,7 +180,7 @@ public: ConditionalDeclaration(Condition *condition, Dsymbols *decl, Dsymbols *elsedecl); Dsymbol *syntaxCopy(Dsymbol *s); bool oneMember(Dsymbol **ps, Identifier *ident); - Dsymbols *include(Scope *sc, ScopeDsymbol *sds); + Dsymbols *include(Scope *sc); void addComment(const utf8_t *comment); void setScope(Scope *sc); void accept(Visitor *v) { v->visit(this); } @@ -195,7 +195,7 @@ public: StaticIfDeclaration(Condition *condition, Dsymbols *decl, Dsymbols *elsedecl); Dsymbol *syntaxCopy(Dsymbol *s); - Dsymbols *include(Scope *sc, ScopeDsymbol *sds); + Dsymbols *include(Scope *sc); void addMember(Scope *sc, ScopeDsymbol *sds); void setScope(Scope *sc); void importAll(Scope *sc); @@ -216,7 +216,7 @@ public: StaticForeachDeclaration(StaticForeach *sfe, Dsymbols *decl); Dsymbol *syntaxCopy(Dsymbol *s); bool oneMember(Dsymbol **ps, Identifier *ident); - Dsymbols *include(Scope *sc, ScopeDsymbol *sds); + Dsymbols *include(Scope *sc); void addMember(Scope *sc, ScopeDsymbol *sds); void addComment(const utf8_t *comment); void setScope(Scope *sc); |