From 5fa9fce8d42ce384ef9f09de2f96078dc34cfb68 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Daniel=20Marjam=C3=A4ki?= Date: Wed, 21 Jan 2009 19:11:27 +0000 Subject: [PATCH] uninitialized variables: run always --- src/checkclass.cpp | 2 +- src/cppcheck.cpp | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/src/checkclass.cpp b/src/checkclass.cpp index cf0718ff1..75ad91cc5 100644 --- a/src/checkclass.cpp +++ b/src/checkclass.cpp @@ -389,7 +389,7 @@ void CheckClass::constructors() if (! constructor_token) { // If "--style" has been given, give a warning - if (_settings._checkCodingStyle) + if (ErrorMessage::noConstructor(_settings)) { // If the class has member variables there should be an constructor struct VAR *varlist = ClassChecking_GetVarList(tok1); diff --git a/src/cppcheck.cpp b/src/cppcheck.cpp index 01fb731ac..58017f6ed 100644 --- a/src/cppcheck.cpp +++ b/src/cppcheck.cpp @@ -271,7 +271,7 @@ void CppCheck::checkFile(const std::string &code, const char FileName[]) checkMemoryLeak.CheckMemoryLeak(); // Check that all class constructors are ok. - if (ErrorMessage::noConstructor(_settings) && ErrorMessage::uninitVar()) + if (ErrorMessage::noConstructor(_settings) || ErrorMessage::uninitVar()) checkClass.constructors(); // Check that all base classes have virtual destructors