Mercurial > projects > ldc
changeset 801:c8d9b30a0dc2
merge
author | Tomas Lindquist Olsen <tomas.l.olsen@gmail.com> |
---|---|
date | Sat, 29 Nov 2008 18:28:32 +0100 |
parents | d14e4594c7d7 (current diff) 9f92b6e40fd3 (diff) |
children | 28ce72c60a21 |
files | gen/classes.cpp |
diffstat | 2 files changed, 2 insertions(+), 2 deletions(-) [+] |
line wrap: on
line diff
--- a/gen/classes.cpp Sat Nov 29 18:28:17 2008 +0100 +++ b/gen/classes.cpp Sat Nov 29 18:28:32 2008 +0100 @@ -547,7 +547,7 @@ FuncDeclaration* fd = dsym->isFuncDeclaration(); assert(fd); - if (fd->isAbstract()) + if (fd->isAbstract() || (cd->isAbstract() && !fd->fbody)) { sinits[k] = getNullPtr(getVoidPtrType()); }
--- a/gen/llvmhelpers.cpp Sat Nov 29 18:28:17 2008 +0100 +++ b/gen/llvmhelpers.cpp Sat Nov 29 18:28:32 2008 +0100 @@ -972,7 +972,7 @@ // FIXME: I don't think it's thread safe ... bool doLazyInit = false; - Dsymbol* par = vd->toParent2(); + Dsymbol* par = vd->toParent(); if (par && par->isFuncDeclaration() && vd->init) {