Fix extern const struct merging
This commit is contained in:
parent
4d193a30b0
commit
94607cab7f
|
@ -691,13 +691,11 @@ Declaration* Parser::ParseStructDeclaration(uint64 flags, DecType dt, Declaratio
|
||||||
|
|
||||||
mScope = oscope;
|
mScope = oscope;
|
||||||
}
|
}
|
||||||
else
|
|
||||||
{
|
|
||||||
if ((flags & ~dec->mFlags) == DTF_CONST)
|
if ((flags & ~dec->mFlags) == DTF_CONST)
|
||||||
dec = dec->ToConstType();
|
dec = dec->ToConstType();
|
||||||
else if ((flags & ~dec->mFlags) == DTF_VOLATILE)
|
else if ((flags & ~dec->mFlags) == DTF_VOLATILE)
|
||||||
dec = dec->ToVolatileType();
|
dec = dec->ToVolatileType();
|
||||||
}
|
|
||||||
|
|
||||||
return dec;
|
return dec;
|
||||||
}
|
}
|
||||||
|
|
Loading…
Reference in New Issue