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 2011-11-29 20:44:23 +01:00
parent baa97d53fc
commit 0d48cd390b
1 changed files with 6 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

12
lib/checkother.cpp
View File

@ -2426,7 +2426,7 @@ namespace {
struct FuncFilter { struct FuncFilter {
FuncFilter(const Scope *scope, const Token *tok): _scope(scope), _tok(tok) {} FuncFilter(const Scope *scope, const Token *tok): _scope(scope), _tok(tok) {}
bool operator() (const Function &func) { bool operator()(const Function &func) {
// todo: function args, etc?? // todo: function args, etc??
bool matchingFunc = func.type == Function::eFunction && bool matchingFunc = func.type == Function::eFunction &&
_tok->str() == func.token->str(); _tok->str() == func.token->str();
@ -2464,8 +2464,8 @@ namespace {
if (v == 0 && Token::Match(prev, "strcmp|strncmp|strlen|memcmp|strcasecmp|strncasecmp")) if (v == 0 && Token::Match(prev, "strcmp|strncmp|strlen|memcmp|strcasecmp|strncasecmp"))
return false; return false;
std::list<Function>::const_iterator it = std::find_if(constFunctions.begin(), std::list<Function>::const_iterator it = std::find_if(constFunctions.begin(),
constFunctions.end(), constFunctions.end(),
FuncFilter(v ? v->type(): 0, prev)); FuncFilter(v ? v->type(): 0, prev));
if (it == constFunctions.end()) if (it == constFunctions.end())
return true; return true;
} }
@ -2550,9 +2550,9 @@ void CheckOther::checkExpressionRange(const std::list<Function> &constFunctions,
} }
void CheckOther::complexDuplicateExpressionCheck(const std::list<Function> &constFunctions, void CheckOther::complexDuplicateExpressionCheck(const std::list<Function> &constFunctions,
const Token *classStart, const Token *classStart,
const std::string &toCheck, const std::string &toCheck,
const std::string &alt) const std::string &alt)
{ {
std::string statementStart(",|=|return"); std::string statementStart(",|=|return");
if (!alt.empty()) if (!alt.empty())