passedByReference: avoid false positives for std::pair

This commit is contained in:
Daniel Marjamäki 2018-06-08 10:19:02 +02:00
parent 44c78d1770
commit 84f0a18053
2 changed files with 9 additions and 1 deletions

View File

@ -1427,7 +1427,7 @@ void CheckOther::checkPassByReference()
const Token* const tok = var->typeStartToken();
if (var->isStlStringType()) {
;
} else if (var->isStlType() && Token::Match(tok, "std :: %type% <") && !Token::simpleMatch(tok->linkAt(3), "> ::") && !Token::Match(tok->tokAt(2), "initializer_list|weak_ptr|auto_ptr|unique_ptr|shared_ptr|function")) {
} else if (var->isStlType() && Token::Match(tok, "std :: %type% <") && !Token::simpleMatch(tok->linkAt(3), "> ::") && !Token::Match(tok->tokAt(2), "initializer_list|weak_ptr|auto_ptr|unique_ptr|shared_ptr|function|pair")) {
;
} else if (var->type() && !var->type()->isEnumType()) { // Check if type is a struct or class.
// Ensure that it is a large object.

View File

@ -1384,6 +1384,14 @@ private:
check("void f(const std::function<F> ptr) {}");
ASSERT_EQUALS("", errout.str());
{
check("void f(const std::pair<int,int> x) {}");
ASSERT_EQUALS("", errout.str());
check("void f(const std::pair<std::string,std::string> x) {}");
TODO_ASSERT_EQUALS("error", "", errout.str());
}
check("void f(const std::string::size_type x) {}");
ASSERT_EQUALS("", errout.str());