Mercurial > projects > ldc

comparison dmd/class.c @ 1195:e961851fb8be

Find changesets by keywords (author, files, the commit message), revision number or hash, or revset expression.
Merged DMD 1.042.
author Tomas Lindquist Olsen <tomas.l.olsen gmail.com>
date Fri, 03 Apr 2009 17:59:34 +0200
parents 1860414bf3b7
children 78038e540342
comparison
equal deleted inserted replaced
1194:1853dcd9b944 1195:e961851fb8be
560 alignsize = baseClass->alignsize; 560 alignsize = baseClass->alignsize;
561 // if (isnested) 561 // if (isnested)
562 // sc->offset += PTRSIZE; // room for uplevel context pointer 562 // sc->offset += PTRSIZE; // room for uplevel context pointer
563 } 563 }
564 else 564 else
565 { sc->offset = 2*PTRSIZE; // allow room for vptr[] and monitor 565 { sc->offset = PTRSIZE * 2; // allow room for vptr[] and monitor
566 alignsize = PTRSIZE; 566 alignsize = PTRSIZE;
567 } 567 }
568 structsize = sc->offset; 568 structsize = sc->offset;
569 Scope scsave = *sc; 569 Scope scsave = *sc;
570 int members_dim = members->dim; 570 int members_dim = members->dim;
1150 sc->parent = this; 1150 sc->parent = this;
1151 if (isCOMinterface()) 1151 if (isCOMinterface())
1152 sc->linkage = LINKwindows; 1152 sc->linkage = LINKwindows;
1153 sc->structalign = 8; 1153 sc->structalign = 8;
1154 structalign = sc->structalign; 1154 structalign = sc->structalign;
1155 sc->offset = 2*PTRSIZE; 1155 sc->offset = PTRSIZE * 2;
1156 inuse++; 1156 inuse++;
1157 for (i = 0; i < members->dim; i++) 1157 for (i = 0; i < members->dim; i++)
1158 { 1158 {
1159 Dsymbol *s = (Dsymbol *)members->data[i]; 1159 Dsymbol *s = (Dsymbol *)members->data[i];
1160 s->semantic(sc); 1160 s->semantic(sc);