walkero
/
cppcheck
1
0
Fork 0
Code Issues Pull Requests Projects Releases 1 Wiki Activity

Running astyle, no functional changes.

This commit is contained in:
Martin Ettl 2015-05-29 19:15:41 +02:00
parent e41beb4f8d
commit 9236ea4a20
3 changed files with 6 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
lib/templatesimplifier.cpp
View File

@ -212,7 +212,7 @@ bool TemplateSimplifier::hasComplicatedSyntaxErrorsInTemplates(const Token *toke
}
if (level > 0) {
errorToken=tok;
return true;
return true;
}
}
}

2
lib/tokenize.cpp
View File

@ -7520,7 +7520,7 @@ void Tokenizer::simplifyEnum()
break;
if (Token::Match(temp, "class|struct"))
temp = temp->next();
if (!temp)
if (!temp)
break;
if (!Token::Match(temp, "[{:]") &&
(!temp->isName() || !Token::Match(temp->next(), "[{:;]")))

8
test/testgarbage.cpp
View File

@ -88,8 +88,8 @@ private:
TEST_CASE(garbageCode47); // #6706
TEST_CASE(garbageCode48); // #6712
TEST_CASE(garbageCode49); // #6715
TEST_CASE(garbageCode50); // #6718
TEST_CASE(garbageCode51); // #6719
TEST_CASE(garbageCode50); // #6718
TEST_CASE(garbageCode51); // #6719
TEST_CASE(garbageValueFlow);
TEST_CASE(garbageSymbolDatabase);
@ -507,11 +507,11 @@ private:
ASSERT_THROW(checkCode(" ( ( ) ) { } ( { ( __builtin_va_arg_pack ( ) ) ; } ) { ( int { ( ) ( ( ) ) } ( ) { } ( ) ) += ( ) }"), InternalError);
}
void garbageCode50() { // #6718
void garbageCode50() { // #6718
checkCode(" enum struct");
}
void garbageCode51() { // #6719
void garbageCode51() { // #6719
checkCode(" (const \"C\" ...); struct base { int f2; base (int arg1, int arg2); }; global_base(0x55, 0xff); { ((global_base.f1 0x55) (global_base.f2 0xff)) { } } base::base(int arg1, int arg2) { f2 = }");
}