Travis; Fix Cppcheck warnings
This commit is contained in:
parent
cbb388d458
commit
4d497712fb
|
@ -5706,13 +5706,13 @@ void SymbolDatabase::setValueType(Token *tok, const ValueType &valuetype)
|
||||||
|
|
||||||
if (ternary || parent->isArithmeticalOp() || parent->tokType() == Token::eIncDecOp) {
|
if (ternary || parent->isArithmeticalOp() || parent->tokType() == Token::eIncDecOp) {
|
||||||
// CONTAINER + pointer => CONTAINER
|
// CONTAINER + pointer => CONTAINER
|
||||||
if (parent->str() == "+" && vt1 && vt1->type == ValueType::Type::CONTAINER && vt2 && vt2->pointer != 0) {
|
if (parent->str() == "+" && vt1->type == ValueType::Type::CONTAINER && vt2 && vt2->pointer != 0) {
|
||||||
setValueType(parent, *vt1);
|
setValueType(parent, *vt1);
|
||||||
return;
|
return;
|
||||||
}
|
}
|
||||||
|
|
||||||
// pointer + CONTAINER => CONTAINER
|
// pointer + CONTAINER => CONTAINER
|
||||||
if (parent->str() == "+" && vt1 && vt1->pointer != 0U && vt2 && vt2->type == ValueType::Type::CONTAINER) {
|
if (parent->str() == "+" && vt1->pointer != 0U && vt2 && vt2->type == ValueType::Type::CONTAINER) {
|
||||||
setValueType(parent, *vt2);
|
setValueType(parent, *vt2);
|
||||||
return;
|
return;
|
||||||
}
|
}
|
||||||
|
|
Loading…
Reference in New Issue