Merge branch 'master' into merge-2.068

This commit is contained in:
Martin 2015-10-02 15:38:02 +02:00
commit 8ee0e250c7
23 changed files with 246 additions and 172 deletions

View file

@ -1178,7 +1178,7 @@ LLConstant* DtoConstInitializer(Loc& loc, Type* type, Initializer* init)
else if (ArrayInitializer* ai = init->isArrayInitializer())
{
Logger::println("const array initializer");
_init = DtoConstArrayInitializer(ai);
_init = DtoConstArrayInitializer(ai, type);
}
else if (init->isVoidInitializer())
{