comparison dmd/class.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
comparison
equal deleted inserted replaced
1629:b07d683ba4d0 1630:44b145be2ef5
262 if (scope) 262 if (scope)
263 { sc = scope; 263 { sc = scope;
264 scx = scope; // save so we don't make redundant copies 264 scx = scope; // save so we don't make redundant copies
265 scope = NULL; 265 scope = NULL;
266 } 266 }
267 unsigned dprogress_save = Module::dprogress;
267 #ifdef IN_GCC 268 #ifdef IN_GCC
268 methods.setDim(0); 269 methods.setDim(0);
269 #endif 270 #endif
270 271
271 if (sc->stc & STCdeprecated) 272 if (sc->stc & STCdeprecated)
626 627
627 scope = scx ? scx : new Scope(*sc); 628 scope = scx ? scx : new Scope(*sc);
628 scope->setNoFree(); 629 scope->setNoFree();
629 scope->module->addDeferredSemantic(this); 630 scope->module->addDeferredSemantic(this);
630 631
632 Module::dprogress = dprogress_save;
633
631 //printf("\tsemantic('%s') failed due to forward references\n", toChars()); 634 //printf("\tsemantic('%s') failed due to forward references\n", toChars());
632 return; 635 return;
633 } 636 }
634 637
635 //printf("\tsemantic('%s') successful\n", toChars()); 638 //printf("\tsemantic('%s') successful\n", toChars());