Skip to content

Commit 866c0ce

Browse files
Leander SchultenLeander Schulten
authored andcommitted
make ci happy
1 parent 9749032 commit 866c0ce

2 files changed

Lines changed: 2 additions & 3 deletions

File tree

.github/workflows/selfcheck.yml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -121,7 +121,7 @@ jobs:
121121
122122
- name: Self check (unusedFunction / no test / no gui)
123123
run: |
124-
supprs="--suppress=unusedFunction:lib/errorlogger.h:196 --suppress=unusedFunction:lib/importproject.cpp:1673 --suppress=unusedFunction:lib/importproject.cpp:1697"
124+
supprs="--suppress=unusedFunction:lib/errorlogger.h:197 --suppress=unusedFunction:lib/importproject.cpp:1660 --suppress=unusedFunction:lib/importproject.cpp:1684"
125125
./cppcheck -q --template=selfcheck --error-exitcode=1 --library=cppcheck-lib -D__CPPCHECK__ -D__GNUC__ --enable=unusedFunction,information --exception-handling -rp=. --project=cmake.output.notest_nogui/compile_commands.json --suppressions-list=.selfcheck_unused_suppressions --inline-suppr $supprs
126126
env:
127127
DISABLE_VALUEFLOW: 1

lib/importproject.cpp

Lines changed: 1 addition & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -692,7 +692,7 @@ namespace {
692692
if (tok->str() == "||")
693693
return boolResult(executeOp1(tok, p) == "True" || executeOp2(tok, p) == "True");
694694
if (tok->str() == "(" && Token::Match(tok->previous(), "$ ( %name% . %name% (")) {
695-
const std::string propertyName = tok->next()->str();
695+
const std::string& propertyName = tok->strAt(1);
696696
std::string propertyValue;
697697
if (propertyName == "Configuration")
698698
propertyValue = p.configuration;
@@ -1706,6 +1706,5 @@ bool cppcheck::testing::evaluateVcxprojCondition(const std::string& condition, c
17061706
ProjectConfiguration p;
17071707
p.configuration = configuration;
17081708
p.platformStr = platform;
1709-
std::vector<std::string> errors;
17101709
return ConditionalGroup::evalCondition(condition, p);
17111710
}

0 commit comments

Comments
 (0)