Mercurial > projects > ldc
changeset 1363:b7c8506e1eed
Automated merge with http://hg.dsource.org/projects/ldc
author | Christian Kamm <kamm incasoftware de> |
---|---|
date | Sat, 16 May 2009 14:22:23 +0200 |
parents | 67ac63740c7f (current diff) 194852badf8c (diff) |
children | 46f6365a50d7 |
files | |
diffstat | 2 files changed, 7 insertions(+), 4 deletions(-) [+] |
line wrap: on
line diff
--- a/dmd/declaration.c Sat May 16 13:50:44 2009 +0200 +++ b/dmd/declaration.c Sat May 16 14:22:23 2009 +0200 @@ -502,16 +502,16 @@ FuncDeclaration *f = s->toAlias()->isFuncDeclaration(); if (f) { - FuncAliasDeclaration *fa = new FuncAliasDeclaration(f); - fa->importprot = importprot; if (overnext) { + FuncAliasDeclaration *fa = new FuncAliasDeclaration(f); + fa->importprot = importprot; if (!fa->overloadInsert(overnext)) ScopeDsymbol::multiplyDefined(0, f, overnext); overnext = NULL; + s = fa; + s->parent = sc->parent; } - s = fa; - s->parent = sc->parent; } if (overnext) ScopeDsymbol::multiplyDefined(0, s, overnext);
--- a/dmd/func.c Sat May 16 13:50:44 2009 +0200 +++ b/dmd/func.c Sat May 16 14:22:23 2009 +0200 @@ -1560,6 +1560,9 @@ break; if (next == fstart) break; + if (a->importprot == PROTprivate && a->getModule() != from) + if (FuncDeclaration* fd = next->isFuncDeclaration()) + next = fd->overnext; } else {