Mercurial > projects > ldc
comparison dmd/class.c @ 1367:8026319762be
Merged DMD 1.045 !!!
author | Tomas Lindquist Olsen <tomas.l.olsen gmail com> |
---|---|
date | Sat, 16 May 2009 22:21:31 +0200 |
parents | 78038e540342 |
children | 05c235309d6f |
comparison
equal
deleted
inserted
replaced
1366:81121ac19f61 | 1367:8026319762be |
---|---|
520 } | 520 } |
521 } | 521 } |
522 else | 522 else |
523 assert(0); | 523 assert(0); |
524 assert(!vthis); | 524 assert(!vthis); |
525 vthis = new ThisDeclaration(t); | 525 vthis = new ThisDeclaration(loc, t); |
526 members->push(vthis); | 526 members->push(vthis); |
527 } | 527 } |
528 } | 528 } |
529 } | 529 } |
530 } | 530 } |
1223 | 1223 |
1224 if (this == b->base) | 1224 if (this == b->base) |
1225 { | 1225 { |
1226 if (poffset) | 1226 if (poffset) |
1227 { *poffset = b->offset; | 1227 { *poffset = b->offset; |
1228 if (j && bc->base->isInterfaceDeclaration()) | |
1229 *poffset = OFFSET_RUNTIME; | |
1228 } | 1230 } |
1229 return 1; | 1231 return 1; |
1230 } | 1232 } |
1231 if (isBaseOf(b, poffset)) | 1233 if (isBaseOf(b, poffset)) |
1232 { | 1234 { if (j && poffset && bc->base->isInterfaceDeclaration()) |
1235 *poffset = OFFSET_RUNTIME; | |
1233 return 1; | 1236 return 1; |
1234 } | 1237 } |
1235 } | 1238 } |
1236 if (poffset) | 1239 if (poffset) |
1237 *poffset = 0; | 1240 *poffset = 0; |