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

Run astyle

This commit is contained in:
amai2012 2016-04-25 11:12:35 +02:00
parent 479f00030e
commit a54ec615f3
2 changed files with 11 additions and 11 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
lib/symboldatabase.cpp
View File

@ -2419,7 +2419,7 @@ void SymbolDatabase::printOut(const char *title) const
std::cout << "int"; std::cout << "int";
std::cout << std::endl; std::cout << std::endl;
std::cout << " enumClass: " << scope->enumClass << std::endl; std::cout << " enumClass: " << scope->enumClass << std::endl;
for (std::vector<Enumerator>::const_iterator enumerator = scope->enumeratorList.begin(); enumerator != scope->enumeratorList.end(); ++enumerator) { for (std::vector<Enumerator>::const_iterator enumerator = scope->enumeratorList.begin(); enumerator != scope->enumeratorList.end(); ++enumerator) {
std::cout << " Enumerator: " << enumerator->name->str() << " = "; std::cout << " Enumerator: " << enumerator->name->str() << " = ";
if (enumerator->value_known) { if (enumerator->value_known) {
std::cout << enumerator->value; std::cout << enumerator->value;
@ -3358,7 +3358,7 @@ const Enumerator * SymbolDatabase::findEnumerator(const Token * tok) const
if (enumerator) if (enumerator)
return enumerator; return enumerator;
for (std::list<Scope *>::const_iterator s = scope->nestedList.begin(); s != scope->nestedList.end(); ++s) { for (std::list<Scope *>::const_iterator s = scope->nestedList.begin(); s != scope->nestedList.end(); ++s) {
enumerator = (*s)->findEnumerator(tok->str()); enumerator = (*s)->findEnumerator(tok->str());
if (enumerator) if (enumerator)

18
test/testsimplifytypedef.cpp
View File

@ -2357,16 +2357,16 @@ private:
void simplifyTypedef118() { // #5749 void simplifyTypedef118() { // #5749
const char code[] = "struct ClassyClass {\n" const char code[] = "struct ClassyClass {\n"
"int id;\n" "int id;\n"
"typedef int (ClassyClass::*funky_type);\n" "typedef int (ClassyClass::*funky_type);\n"
"operator funky_type() {\n" "operator funky_type() {\n"
"return &ClassyClass::id;\n" "return &ClassyClass::id;\n"
"}}"; "}}";
const char expected[] = "struct ClassyClass { " const char expected[] = "struct ClassyClass { "
"int id ; " "int id ; "
"operatorintClassyClass::* ( ) { " "operatorintClassyClass::* ( ) { "
"return & ClassyClass :: id ; " "return & ClassyClass :: id ; "
"} }"; "} }";
ASSERT_EQUALS(expected, tok(code, false)); ASSERT_EQUALS(expected, tok(code, false));
ASSERT_EQUALS("", errout.str()); ASSERT_EQUALS("", errout.str());
} }