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

Running astyle [ci skip]

This commit is contained in:
orbitcowboy 2021-06-03 07:35:50 +02:00
parent 601ca6b3c5
commit a585834445
2 changed files with 7 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
lib/symboldatabase.h
View File

@ -1273,7 +1273,9 @@ public:
static MatchResult matchParameter(const ValueType *call, const ValueType *func); static MatchResult matchParameter(const ValueType *call, const ValueType *func);
static MatchResult matchParameter(const ValueType *call, const Variable *callVar, const Variable *funcVar); static MatchResult matchParameter(const ValueType *call, const Variable *callVar, const Variable *funcVar);
bool isPrimitive() const { return (type >= ValueType::Type::BOOL); } bool isPrimitive() const {
return (type >= ValueType::Type::BOOL);
}
bool isIntegral() const { bool isIntegral() const {
return (type >= ValueType::Type::BOOL && type <= ValueType::Type::UNKNOWN_INT); return (type >= ValueType::Type::BOOL && type <= ValueType::Type::UNKNOWN_INT);

6
lib/token.cpp
View File

@ -2304,8 +2304,10 @@ const ::Type* Token::typeOf(const Token* tok, const Token** typeTok)
if (vars.empty()) if (vars.empty())
return nullptr; return nullptr;
if (std::all_of( if (std::all_of(
vars.begin(), vars.end(), [&](const Variable* var) { return var->type() == vars.front()->type(); })) vars.begin(), vars.end(), [&](const Variable* var) {
return vars.front()->type(); return var->type() == vars.front()->type();
}))
return vars.front()->type();
} }
return nullptr; return nullptr;