Mercurial > projects > ldc
diff dmd/access.c @ 1630:44b145be2ef5
Merge dmd 1.056.
| author | Robert Clipsham <robert@octarineparrot.com> |
|---|---|
| date | Sat, 06 Feb 2010 15:53:52 +0000 |
| parents | eb7cb41ee585 |
| children |
line wrap: on
line diff
--- a/dmd/access.c Wed Jan 06 19:53:35 2010 +0100 +++ b/dmd/access.c Sat Feb 06 15:53:52 2010 +0000 @@ -392,12 +392,11 @@ #endif if (!e) { - if (d->getModule() != sc->module) - if (d->prot() == PROTprivate || - d->prot() == PROTpackage && !hasPackageAccess(sc, d)) + if (d->prot() == PROTprivate && d->getModule() != sc->module || + d->prot() == PROTpackage && !hasPackageAccess(sc, d)) - error(loc, "%s %s.%s is not accessible from %s", - d->kind(), d->getModule()->toChars(), d->toChars(), sc->module->toChars()); + error(loc, "%s %s.%s is not accessible from %s", + d->kind(), d->getModule()->toChars(), d->toChars(), sc->module->toChars()); } else if (e->type->ty == Tclass) { // Do access check