D/ldc
1
0
Fork 0
mirror of https://github.com/xomboverlord/ldc.git synced 2026-01-18 05:43:14 +01:00
Code Issues Actions Packages Projects Releases Wiki Activity

Automated merge with http://hg.dsource.org/projects/ldc

Browse Source
This commit is contained in:
Christian Kamm
2009-05-16 14:22:23 +02:00
parent 46b200a4ed 8c422bde53
commit 61514569ff
2 changed files with 7 additions and 4 deletions
Download Patch File Download Diff File Expand all files Collapse all files

8
dmd/declaration.c
View File

@@ -502,16 +502,16 @@ void AliasDeclaration::semantic(Scope *sc)
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);

3
dmd/func.c
View File

@@ -1560,6 +1560,9 @@ int overloadApply(Module* from, FuncDeclaration *fstart,
break;
if (next == fstart)
break;
if (a->importprot == PROTprivate && a->getModule() != from)
if (FuncDeclaration* fd = next->isFuncDeclaration())
next = fd->overnext;
}
else
{