Running astyle [ci skip]
This commit is contained in:
parent
601ca6b3c5
commit
a585834445
|
@ -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);
|
||||||
|
|
|
@ -2304,7 +2304,9 @@ 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 var->type() == vars.front()->type();
|
||||||
|
}))
|
||||||
return vars.front()->type();
|
return vars.front()->type();
|
||||||
}
|
}
|
||||||
|
|
||||||
|
|
Loading…
Reference in New Issue