Skip to content
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
8 changes: 8 additions & 0 deletions lib/checkclass.cpp
Original file line number Diff line number Diff line change
Expand Up @@ -988,6 +988,14 @@ void CheckClass::initializeVarList(const Function &func, std::list<const Functio
else if (!member->isConst() && !member->isStatic()) {
assignAllVar(usage);
}

// const method, assume it assigns all mutable members
else if (member->isConst()) {
for (Usage& i: usage) {
if (i.var->isMutable())
i.assign = true;
}
}
}

// not member function
Expand Down
13 changes: 13 additions & 0 deletions test/testconstructors.cpp
Original file line number Diff line number Diff line change
Expand Up @@ -116,6 +116,7 @@ class TestConstructors : public TestFixture {
TEST_CASE(initvar_chained_assign); // BUG 2270433
TEST_CASE(initvar_2constructors); // BUG 2270353
TEST_CASE(initvar_constvar);
TEST_CASE(initvar_mutablevar);
TEST_CASE(initvar_staticvar);
TEST_CASE(initvar_brace_init);
TEST_CASE(initvar_union);
Expand Down Expand Up @@ -1194,6 +1195,18 @@ class TestConstructors : public TestFixture {
}


void initvar_mutablevar() {
check("class Foo {\n"
"public:\n"
" Foo() { update(); }\n"
"private:\n"
" void update() const;\n"
" mutable int x;\n"
"};");
ASSERT_EQUALS("", errout.str());
}


void initvar_staticvar() {
check("class Fred\n"
"{\n"
Expand Down