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

astyle formatting

This commit is contained in:
Daniel Marjamäki 2010-03-19 16:12:51 +01:00
parent 95d22de690
commit c7bd437d7d
2 changed files with 17 additions and 17 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
lib/checkother.h
View File

@ -101,12 +101,12 @@ public:
/** @brief Redundant code: if (p) delete p; */ /** @brief Redundant code: if (p) delete p; */
void warningRedundantCode(); void warningRedundantCode();
/** /**
* @brief Invalid function usage (invalid radix / overlapping data) * @brief Invalid function usage (invalid radix / overlapping data)
* *
* %Check that given function parameters are valid according to the standard * %Check that given function parameters are valid according to the standard
* - wrong radix given for strtol/strtoul * - wrong radix given for strtol/strtoul
* - overlapping data when using sprintf/snprintf * - overlapping data when using sprintf/snprintf
*/ */
void invalidFunctionUsage(); void invalidFunctionUsage();

28
lib/tokenize.cpp
View File

@ -1928,20 +1928,20 @@ void Tokenizer::simplifyTemplates2()
else if (Token::Match(tok, "; %type% <")) else if (Token::Match(tok, "; %type% <"))
{ {
const Token *tok2 = tok->tokAt(3); const Token *tok2 = tok->tokAt(3);
std::string type; std::string type;
while (Token::Match(tok2, "%type% ,") || Token::Match(tok2, "%num% ,")) while (Token::Match(tok2, "%type% ,") || Token::Match(tok2, "%num% ,"))
{ {
type += tok2->str() + ","; type += tok2->str() + ",";
tok2 = tok2->tokAt(2); tok2 = tok2->tokAt(2);
} }
if (Token::Match(tok2, "%type% > (") || Token::Match(tok2, "%num% > (")) if (Token::Match(tok2, "%type% > (") || Token::Match(tok2, "%num% > ("))
{ {
type += tok2->str(); type += tok2->str();
tok = tok->next(); tok = tok->next();
tok->str(tok->str() + "<" + type + ">"); tok->str(tok->str() + "<" + type + ">");
Token::eraseTokens(tok, tok2->tokAt(2)); Token::eraseTokens(tok, tok2->tokAt(2));
} }
} }
} }
} }