Fix

Author: web-flow

lib/checkclass.cpp

@@ -352,14 +352,15 @@ void CheckClass::constructors()
             // Variables with default initializers
             bool hasAnyDefaultInit = false;
             bool hasAnySelfInit = false;
+            const bool cpp14OrLater = mSettings->standards.cpp >= Standards::CPP14;
             for (Usage& usage : usageList) {
                 const Variable& var = *usage.var;
 
                 // check for C++11 initializer
                 if (var.hasDefault()) {
                     usage.init = true;
                     hasAnyDefaultInit = true;
-                } else if (!hasAnySelfInit && isInitialized(usage, FunctionType::eConstructor)) {
+                } else if (cpp14OrLater && !hasAnySelfInit && isInitialized(usage, FunctionType::eConstructor)) {
                     hasAnySelfInit = true;
                 }
             }
@@ -374,6 +375,9 @@ void CheckClass::constructors()
                     continue;
 
                 const Variable& var = *usage.var;
+                if (var.typeScope() && var.typeScope()->numConstructors > 0)
+                    continue;
+                    
                 if (diagVars.count(&var) == 0)
                     uninitVarError(var.nameToken(), false, FunctionType::eConstructor, var.scope()->className, var.name(), false, false, true);
             }

test/testconstructors.cpp

@@ -770,15 +770,30 @@ class TestConstructors : public TestFixture {
               "};\n");
         ASSERT_EQUALS("", errout_str());
 
-        check("struct S { int i = 0; };\n" // #14697
+        check("struct S {\n"
+              "    explicit S(int);\n"
+              "    S(const S&);\n"
+              "    int i;\n"
+              "};\n"
               "struct T {\n"
               "    S s;\n"
-              "    int j;\n"
-              "};\n"
-              "struct U {\n"
-              "    std::string a;\n"
-              "    int k;\n"
+              "    int j{};\n"
               "};\n");
+        ASSERT_EQUALS("", errout_str());
+
+        const char code[] = "struct S { int i = 0; };\n" // #14697
+                            "struct T {\n"
+                            "    S s;\n"
+                            "    int j;\n"
+                            "};\n"
+                            "struct U {\n"
+                            "    std::string a;\n"
+                            "    int k;\n"
+                            "};\n";
+        const Settings s = settingsBuilder(settings).cpp(Standards::CPP11).build();
+        check(code, s);
+        ASSERT_EQUALS("", errout_str());
+        check(code);
         ASSERT_EQUALS("[test.cpp:4:9]: (warning) Member variable 'T::j' has no initializer. [uninitMemberVarNoCtor]\n"
                       "[test.cpp:8:9]: (warning) Member variable 'U::k' has no initializer. [uninitMemberVarNoCtor]\n",
                       errout_str());