Mercurial > projects > ldc
changeset 1409:ecfec65d86cf
Automated merge with http://hg.dsource.org/projects/ldc
author | Christian Kamm <kamm incasoftware de> |
---|---|
date | Fri, 22 May 2009 10:18:04 +0200 |
parents | 9a049fd1a014 (current diff) afecdb8ee962 (diff) |
children | cc2d8a7388c7 |
files | |
diffstat | 2 files changed, 5 insertions(+), 5 deletions(-) [+] |
line wrap: on
line diff
--- a/dmd/arrayop.c Fri May 22 00:19:54 2009 +0200 +++ b/dmd/arrayop.c Fri May 22 10:18:04 2009 +0200 @@ -281,10 +281,10 @@ // special attention for array ops fd->isArrayOp = true; - sc->module->members->push(fd); + sc->module->importedFrom->members->push(fd); sc = sc->push(); - sc->parent = sc->module; + sc->parent = sc->module->importedFrom; sc->stc = 0; sc->linkage = LINKd; fd->semantic(sc);
--- a/gen/llvmhelpers.cpp Fri May 22 00:19:54 2009 +0200 +++ b/gen/llvmhelpers.cpp Fri May 22 10:18:04 2009 +0200 @@ -1369,13 +1369,13 @@ { if (FuncDeclaration* fd = s->isFuncDeclaration()) { - if (fd->isArrayOp) - return true; - // we can't (and probably shouldn't?) define functions // that weren't semantic3'ed if (fd->semanticRun < 4) return false; + + if (fd->isArrayOp) + return true; } TemplateInstance* tinst = DtoIsTemplateInstance(s);