diff --git a/lib/checkio.cpp b/lib/checkio.cpp index dc233b0f8..7ff94c7ed 100644 --- a/lib/checkio.cpp +++ b/lib/checkio.cpp @@ -1355,11 +1355,11 @@ CheckIO::ArgumentInfo::ArgumentInfo(const Token * tok, const Settings *settings, : variableInfo(nullptr) , typeToken(nullptr) , functionInfo(nullptr) + , tempToken(nullptr) , element(false) , _template(false) , address(false) , isCPP(_isCPP) - , tempToken(nullptr) { if (tok) { if (tok->tokType() == Token::eString) { diff --git a/lib/checkmemoryleak.cpp b/lib/checkmemoryleak.cpp index 3d075bfda..0a32c754b 100644 --- a/lib/checkmemoryleak.cpp +++ b/lib/checkmemoryleak.cpp @@ -2373,8 +2373,8 @@ void CheckMemoryLeakInClass::variable(const Scope *scope, const Token *tokVarnam if (Alloc != No && Alloc != alloc) alloc = CheckMemoryLeak::Many; - std::list callstack; if (alloc != CheckMemoryLeak::Many && Dealloc != CheckMemoryLeak::No && Dealloc != CheckMemoryLeak::Many && Dealloc != alloc) { + std::list callstack; callstack.push_back(tok); mismatchAllocDealloc(callstack, classname + "::" + varname); } @@ -2408,8 +2408,8 @@ void CheckMemoryLeakInClass::variable(const Scope *scope, const Token *tokVarnam if (Dealloc != CheckMemoryLeak::No && Dealloc != dealloc) dealloc = CheckMemoryLeak::Many; - std::list callstack; if (dealloc != CheckMemoryLeak::Many && Alloc != CheckMemoryLeak::No && Alloc != Many && Alloc != dealloc) { + std::list callstack; callstack.push_back(tok); mismatchAllocDealloc(callstack, classname + "::" + varname); } diff --git a/lib/templatesimplifier.cpp b/lib/templatesimplifier.cpp index f6afd5e95..b22643c74 100644 --- a/lib/templatesimplifier.cpp +++ b/lib/templatesimplifier.cpp @@ -1160,7 +1160,7 @@ bool TemplateSimplifier::simplifyCalculations(Token *_tokens) result = (op1 >= op2) ? "1" : "0"; else if (cmp == "<") result = (op1 < op2) ? "1" : "0"; - else if (cmp == ">") + else result = (op1 > op2) ? "1" : "0"; tok->str(result);