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

View File

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

View File

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