diff --git a/cfg/wxwidgets.cfg b/cfg/wxwidgets.cfg
index eacc12f60..a7e1f5db4 100644
--- a/cfg/wxwidgets.cfg
+++ b/cfg/wxwidgets.cfg
@@ -557,6 +557,189 @@
+
+
+
+ false
+
+
+
+
+
+
+
+
+
+
+
+ false
+
+
+
+
+
+ false
+
+
+
+
+
+
+ false
+
+
+
+
+
+
+ false
+
+
+
+
+
+
+
+
+
+ false
+
+
+
+
+
+
+
+ false
+
+
+
+
+
+
+
+ false
+
+
+
+
+
+
+
+ false
+
+
+
+
+
+
+
+ false
+
+
+
+
+
+
+
+ false
+
+
+
+
+
+
+
+ false
+
+
+
+
+
+
+
+ false
+
+
+
+
+
+
+
+ false
+
+
+
+
+
+
+
+ false
+
+
+
+
+
+
+
+ false
+
+
+
+
+
+
+
+
+ false
+
+
+
+
+
+
+
+ false
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+ false
+
+
+
+
+
+
+
+ false
+
+
+
+
+
+
+
+
+
+ false
+
+
+
+
+
+
+
diff --git a/lib/checkcondition.cpp b/lib/checkcondition.cpp
index f37a9c36b..b1acf4305 100644
--- a/lib/checkcondition.cpp
+++ b/lib/checkcondition.cpp
@@ -51,12 +51,13 @@ namespace {
CheckCondition instance;
}
-bool CheckCondition::isAliased(const std::set &vars) const {
+bool CheckCondition::isAliased(const std::set &vars) const
+{
for (const Token *tok = _tokenizer->tokens(); tok; tok = tok->next()) {
- if (Token::Match(tok, "= & %var% ;") && vars.find(tok->tokAt(2)->varId()) != vars.end())
- return true;
- }
- return false;
+ if (Token::Match(tok, "= & %var% ;") && vars.find(tok->tokAt(2)->varId()) != vars.end())
+ return true;
+ }
+ return false;
}
void CheckCondition::assignIf()
@@ -524,14 +525,14 @@ void CheckCondition::multiCondition2()
if (type == MULTICONDITIONTYPE::INNER) {
if (isOppositeCond(false, _tokenizer->isCPP(), cond1, cond2, _settings->library, true)) {
- if (!isAliased(vars))
- oppositeInnerConditionError(cond1, cond2);
+ if (!isAliased(vars))
+ oppositeInnerConditionError(cond1, cond2);
}
} else {
if (isSameExpression(_tokenizer->isCPP(), true, cond1, cond2, _settings->library, true)) {
if (!isAliased(vars))
- sameConditionAfterEarlyExitError(cond1, cond2);
- }
+ sameConditionAfterEarlyExitError(cond1, cond2);
+ }
}
}
diff --git a/lib/checkcondition.h b/lib/checkcondition.h
index ff077b4f6..9e17ca37c 100644
--- a/lib/checkcondition.h
+++ b/lib/checkcondition.h
@@ -114,7 +114,7 @@ public:
void checkInvalidTestForOverflow();
private:
- bool isAliased(const std::set &vars) const;
+ bool isAliased(const std::set &vars) const;
bool isOverlappingCond(const Token * const cond1, const Token * const cond2, bool pure) const;
void assignIfError(const Token *tok1, const Token *tok2, const std::string &condition, bool result);
void mismatchingBitAndError(const Token *tok1, const MathLib::bigint num1, const Token *tok2, const MathLib::bigint num2);