Removed bailouts in CheckClass::privateFunctions and CheckUnusedFunctions when checking code with templates (unnecessary after 2c10e9a6ca
)
This commit is contained in:
parent
2c10e9a6ca
commit
cc1faad34a
|
@ -583,11 +583,6 @@ void CheckClass::privateFunctions()
|
|||
if (!_settings->isEnabled("style"))
|
||||
return;
|
||||
|
||||
// don't check code that contains templates. Templates that are
|
||||
// "unused" are removed from the code. #2067
|
||||
if (_tokenizer->codeWithTemplates())
|
||||
return;
|
||||
|
||||
for (std::list<Scope>::const_iterator scope = symbolDatabase->scopeList.begin(); scope != symbolDatabase->scopeList.end(); ++scope) {
|
||||
// only check classes and structures
|
||||
if (!scope->isClassOrStruct())
|
||||
|
|
|
@ -33,11 +33,6 @@
|
|||
|
||||
void CheckUnusedFunctions::parseTokens(const Tokenizer &tokenizer)
|
||||
{
|
||||
// if there are templates there might be false positives
|
||||
templates |= tokenizer.codeWithTemplates();
|
||||
if (templates)
|
||||
return;
|
||||
|
||||
// Function declarations..
|
||||
for (const Token *tok = tokenizer.tokens(); tok; tok = tok->next()) {
|
||||
if (tok->fileIndex() != 0)
|
||||
|
@ -142,9 +137,6 @@ void CheckUnusedFunctions::parseTokens(const Tokenizer &tokenizer)
|
|||
|
||||
void CheckUnusedFunctions::check(ErrorLogger * const errorLogger)
|
||||
{
|
||||
if (templates)
|
||||
return;
|
||||
|
||||
for (std::map<std::string, FunctionUsage>::const_iterator it = _functions.begin(); it != _functions.end(); ++it) {
|
||||
const FunctionUsage &func = it->second;
|
||||
if (func.usedOtherFile || func.filename.empty())
|
||||
|
|
|
@ -33,12 +33,12 @@
|
|||
class CPPCHECKLIB CheckUnusedFunctions: public Check {
|
||||
public:
|
||||
/** @brief This constructor is used when registering the CheckUnusedFunctions */
|
||||
CheckUnusedFunctions() : Check(myName()), templates(false)
|
||||
CheckUnusedFunctions() : Check(myName())
|
||||
{ }
|
||||
|
||||
/** @brief This constructor is used when running checks. */
|
||||
CheckUnusedFunctions(const Tokenizer *tokenizer, const Settings *settings, ErrorLogger *errorLogger)
|
||||
: Check(myName(), tokenizer, settings, errorLogger), templates(false)
|
||||
: Check(myName(), tokenizer, settings, errorLogger)
|
||||
{ }
|
||||
|
||||
// Parse current tokens and determine..
|
||||
|
@ -89,8 +89,6 @@ private:
|
|||
};
|
||||
|
||||
std::map<std::string, FunctionUsage> _functions;
|
||||
|
||||
bool templates;
|
||||
};
|
||||
/// @}
|
||||
//---------------------------------------------------------------------------
|
||||
|
|
Loading…
Reference in New Issue