Commit 6c0928d9 by John Kessenich

Fix bug dropping some qualifiers when merging with block member default qualification.

parent 69c3d8c1
...@@ -1632,7 +1632,7 @@ void TParseContext::addBlock(int line, TTypeList& typeList, const TString* insta ...@@ -1632,7 +1632,7 @@ void TParseContext::addBlock(int line, TTypeList& typeList, const TString* insta
mergeLayoutQualifiers(line, defaultQualification, currentBlockDefaults); mergeLayoutQualifiers(line, defaultQualification, currentBlockDefaults);
for (unsigned int member = 0; member < typeList.size(); ++member) { for (unsigned int member = 0; member < typeList.size(); ++member) {
TQualifier memberQualification = defaultQualification; TQualifier memberQualification = defaultQualification;
mergeLayoutQualifiers(line, memberQualification, typeList[member].type->getQualifier()); mergeQualifiers(line, memberQualification, typeList[member].type->getQualifier(), false);
typeList[member].type->getQualifier() = memberQualification; typeList[member].type->getQualifier() = memberQualification;
} }
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment