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

Fixed #8573 (FP noCopyConstructor - derive from noncopyable class)

This commit is contained in:
Daniel Marjamäki 2018-06-06 16:02:25 +02:00
parent 453c663fb0
commit 1abc9008d8
2 changed files with 27 additions and 0 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

3
lib/checkclass.cpp
View File

@ -285,6 +285,9 @@ static bool isNonCopyable(const Scope *scope, bool *unknown)
continue; continue;
} }
if (isNonCopyable(baseInfo.type->classScope, &u))
return true;
for (const Function &func : baseInfo.type->classScope->functionList) { for (const Function &func : baseInfo.type->classScope->functionList) {
if (func.type != Function::eCopyConstructor) if (func.type != Function::eCopyConstructor)
continue; continue;

24
test/testclass.cpp
View File

@ -69,6 +69,7 @@ private:
TEST_CASE(copyConstructor1); TEST_CASE(copyConstructor1);
TEST_CASE(copyConstructor2); // ticket #4458 TEST_CASE(copyConstructor2); // ticket #4458
TEST_CASE(copyConstructor3); // defaulted/deleted TEST_CASE(copyConstructor3); // defaulted/deleted
TEST_CASE(copyConstructor4); // base class with private constructor
TEST_CASE(noOperatorEq); // class with memory management should have operator eq TEST_CASE(noOperatorEq); // class with memory management should have operator eq
TEST_CASE(noDestructor); // class with memory management should have destructor TEST_CASE(noDestructor); // class with memory management should have destructor
@ -835,6 +836,29 @@ private:
ASSERT_EQUALS("[test.cpp:3]: (style) Struct 'F' has dynamic memory/resource allocation(s). The copy constructor is explicitly defaulted but the default copy constructor does not work well. It is recommended to define or delete the copy constructor.\n", errout.str()); ASSERT_EQUALS("[test.cpp:3]: (style) Struct 'F' has dynamic memory/resource allocation(s). The copy constructor is explicitly defaulted but the default copy constructor does not work well. It is recommended to define or delete the copy constructor.\n", errout.str());
} }
void copyConstructor4() {
checkCopyConstructor("class noncopyable {\n"
"protected:\n"
" noncopyable() {}\n"
" ~noncopyable() {}\n"
"\n"
"private:\n"
" noncopyable( const noncopyable& );\n"
" const noncopyable& operator=( const noncopyable& );\n"
"};\n"
"\n"
"class Base : private noncopyable {};\n"
"\n"
"class Foo : public Base {\n"
"public:\n"
" Foo() : m_ptr(new int) {}\n"
" ~Foo() { delete m_ptr; }\n"
"private:\n"
" int* m_ptr;\n"
"};");
ASSERT_EQUALS("", errout.str());
}
void noOperatorEq() { void noOperatorEq() {
checkCopyConstructor("struct F {\n" checkCopyConstructor("struct F {\n"
" char* c;\n" " char* c;\n"