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

Resolve C4800

This commit is contained in:
Dmitry-Me 2017-08-15 17:42:56 +03:00
parent 0496e29910
commit 6303437163
2 changed files with 5 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
lib/checkclass.cpp
View File

@ -2410,7 +2410,7 @@ void CheckClass::checkCopyCtorAndEqOperator()
}
if (std::abs(hasCopyCtor - hasAssignmentOperator) == 2)
copyCtorAndEqOperatorError(scope->classDef, scope->className, scope->type == Scope::eStruct, hasCopyCtor);
copyCtorAndEqOperatorError(scope->classDef, scope->className, scope->type == Scope::eStruct, hasCopyCtor != 0);
}
}

8
test/testsymboldatabase.cpp
View File

@ -2824,8 +2824,8 @@ private:
if (classA->name() == "A" && classB->name() == "B" && classC->name() == "C") {
ASSERT(classA->derivedFrom.size() == 1U);
if (classA->derivedFrom.size() == 1) {
ASSERT(classA->derivedFrom[0].type);
if (classA->derivedFrom[0].type) {
ASSERT(classA->derivedFrom[0].type != nullptr);
if (classA->derivedFrom[0].type != nullptr) {
ASSERT(classA->derivedFrom[0].type == classB);
}
}
@ -4635,8 +4635,8 @@ private:
ASSERT(db && db->functionScopes.size() == 1);
if (db && db->functionScopes.size() == 1) {
ASSERT(db->functionScopes[0]->function);
if (db->functionScopes[0]->function) {
ASSERT(db->functionScopes[0]->function != nullptr);
if (db->functionScopes[0]->function != nullptr) {
const Token *retDef = db->functionScopes[0]->function->retDef;
ASSERT_EQUALS("func", retDef ? retDef->str() : "");
}