# HG changeset patch
# User Christian Kamm <kamm incasoftware de>
# Date 1242476543 -7200
# Node ID b7c8506e1eedc0799be8ec1797e8bc97e67a0c21
# Parent  67ac63740c7f869fe10e03b0a89945e78b5a0ef4# Parent  194852badf8c27b5ca37a7991de938cf4f009f86
Automated merge with http://hg.dsource.org/projects/ldc

diff -r 67ac63740c7f -r b7c8506e1eed dmd/declaration.c
--- 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);
diff -r 67ac63740c7f -r b7c8506e1eed dmd/func.c
--- 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
 	    {