Mercurial > projects > ldc
diff dmd/struct.c @ 1630:44b145be2ef5
Merge dmd 1.056.
author | Robert Clipsham <robert@octarineparrot.com> |
---|---|
date | Sat, 06 Feb 2010 15:53:52 +0000 |
parents | 6c36e3f49b28 |
children |
line wrap: on
line diff
--- a/dmd/struct.c Wed Jan 06 19:53:35 2010 +0100 +++ b/dmd/struct.c Sat Feb 06 15:53:52 2010 +0000 @@ -19,6 +19,7 @@ #include "module.h" #include "id.h" #include "statement.h" +#include "template.h" /********************************* AggregateDeclaration ****************************/ @@ -269,6 +270,8 @@ scope = NULL; } + unsigned dprogress_save = Module::dprogress; + parent = sc->parent; type = type->semantic(loc, sc); #if STRUCTTHISREF @@ -417,6 +420,8 @@ scope = scx ? scx : new Scope(*sc); scope->setNoFree(); scope->module->addDeferredSemantic(this); + + Module::dprogress = dprogress_save; //printf("\tdeferring %s\n", toChars()); return; }