CheckClass: Tweak rule of 3 checker

danmar · Apr 24, 2018 · 485d3e0 · 485d3e0
1 parent 5518247
commit 485d3e0
Show file tree

Hide file tree

Showing 2 changed files with 8 additions and 2 deletions.
diff --git a/lib/checkclass.cpp b/lib/checkclass.cpp
@@ -2427,10 +2427,10 @@ void CheckClass::checkRuleOf3()
             continue;
 
         // all 3 methods are defined
-        if (copyCtor == CtorType::WITH_BODY && assignmentOperator == CtorType::WITH_BODY && destructor)
+        if (copyCtor != CtorType::NO && assignmentOperator != CtorType::NO && destructor)
             continue;
 
-        ruleOf3Error(scope->classDef, scope->className, scope->type == Scope::eStruct, copyCtor == CtorType::WITH_BODY, assignmentOperator == CtorType::WITH_BODY, destructor);
+        ruleOf3Error(scope->classDef, scope->className, scope->type == Scope::eStruct, copyCtor != CtorType::NO, assignmentOperator != CtorType::NO, destructor);
     }
 }
 

diff --git a/test/testclass.cpp b/test/testclass.cpp
@@ -244,6 +244,12 @@ class TestClass : public TestFixture {
                      "};");
         ASSERT_EQUALS("[test.cpp:1]: (warning) The class 'A' defines 'operator=' but does not define 'copy constructor' and 'destructor'\n", errout.str());
 
+        checkRuleOf3("class A {\n"
+                     "    ~A() { }\n"
+                     "    int x;\n"
+                     "};");
+        ASSERT_EQUALS("[test.cpp:1]: (warning) The class 'A' defines 'destructor' but does not define 'copy constructor' and 'operator='\n", errout.str());
+
         checkRuleOf3("class A {\n"
                      "    A& operator=(const int &x) { this->x = x; return *this; }\n"
                      "    int x;\n"