Merge pull request #569 from Dmitry-Me/removeBitwiseOpAbuse

Remove bitwise-or abuse
This commit is contained in:
PKEuS 2015-03-23 20:23:07 +01:00
commit ab97d8dd6f
1 changed files with 1 additions and 1 deletions

View File

@ -7831,7 +7831,7 @@ void Tokenizer::simplifyEnum()
const Token *prev = tok2->previous(); const Token *prev = tok2->previous();
bool type = false; bool type = false;
while (prev && (prev->isName() || Token::Match(prev, "*|&|::"))) { while (prev && (prev->isName() || Token::Match(prev, "*|&|::"))) {
type |= (Token::Match(prev, "%type% !!::") && !Token::Match(prev, "throw|return")); type = type || ((Token::Match(prev, "%type% !!::") && !Token::Match(prev, "throw|return")));
prev = prev->previous(); prev = prev->previous();
} }
if (type && (!prev || Token::Match(prev, "[;{}]"))) { if (type && (!prev || Token::Match(prev, "[;{}]"))) {