Merge branch 'master' into merge-2.064

Conflicts:
	runtime/druntime
This commit is contained in:
Kai Nacke
2013-11-26 08:00:10 +01:00
6 changed files with 6 additions and 6 deletions

View File

@@ -598,7 +598,7 @@ void TypeInfoStructDeclaration::llvmDefine()
StructDeclaration *sd = tc->sym;
// can't emit typeinfo for forward declarations
if (sd->sizeok != 1)
if (sd->sizeok != SIZEOKdone)
{
sd->error("cannot emit TypeInfo for forward declaration");
fatal();