Merge branch 'master' into merge-2.064

This commit is contained in:
Kai Nacke
2014-01-03 23:07:50 +01:00

View File

@@ -512,6 +512,14 @@ Expression *ArrayInitializer::toExpression(Type *tx)
edim = ((TypeSArray *)t)->dim->toInteger();
break;
#if IN_LLVM
// Backport from DMD 2.065
case Tvector:
t = ((TypeVector *)t)->basetype;
edim = (size_t)((TypeSArray *)t)->dim->toInteger();
break;
#endif
case Tpointer:
case Tarray:
edim = dim;