Merge branch 'llvm3.0' into merge-3.0

Conflicts:
	gen/configfile.cpp
This commit is contained in:
David Nadlinger
2011-12-04 18:16:36 +01:00
15 changed files with 73 additions and 68 deletions

View File

@@ -1137,7 +1137,7 @@ DValue* DtoDeclarationExp(Dsymbol* declaration)
// choose the right set in case this is a conditional declaration
Array *d = a->include(NULL, NULL);
if (d)
for (int i=0; i < d->dim; ++i)
for (unsigned i=0; i < d->dim; ++i)
{
DtoDeclarationExp((Dsymbol*)d->data[i]);
}
@@ -1146,7 +1146,7 @@ DValue* DtoDeclarationExp(Dsymbol* declaration)
else if (TemplateMixin* m = declaration->isTemplateMixin())
{
Logger::println("TemplateMixin");
for (int i=0; i < m->members->dim; ++i)
for (unsigned i=0; i < m->members->dim; ++i)
{
Dsymbol* mdsym = (Dsymbol*)m->members->data[i];
DtoDeclarationExp(mdsym);
@@ -1162,7 +1162,7 @@ DValue* DtoDeclarationExp(Dsymbol* declaration)
}
assert(tupled->objects);
for (int i=0; i < tupled->objects->dim; ++i)
for (unsigned i=0; i < tupled->objects->dim; ++i)
{
DsymbolExp* exp = (DsymbolExp*)tupled->objects->data[i];
DtoDeclarationExp(exp->s);
@@ -1640,7 +1640,7 @@ bool hasUnalignedFields(Type* t)
// go through all the fields and try to find something unaligned
ts->unaligned = 2;
for (int i = 0; i < sym->fields.dim; i++)
for (unsigned i = 0; i < sym->fields.dim; i++)
{
VarDeclaration* f = (VarDeclaration*)sym->fields.data[i];
unsigned a = f->type->alignsize() - 1;