Skip to content

Commit 79a0d7d

Browse files
Update tokenize.cpp
1 parent 2feda02 commit 79a0d7d

1 file changed

Lines changed: 5 additions & 5 deletions

File tree

lib/tokenize.cpp

Lines changed: 5 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -10345,7 +10345,11 @@ void Tokenizer::simplifyNamespaceStd()
1034510345
continue;
1034610346
if (Token::Match(tok->previous(), ".|::|namespace"))
1034710347
continue;
10348-
if (Token::simpleMatch(tok->next(), "(")) {
10348+
if (mSettings.library.hasAnyTypeCheck("std::" + tok->str()) ||
10349+
mSettings.library.podtype("std::" + tok->str()) ||
10350+
isStdContainerOrIterator(tok, mSettings))
10351+
insert = true;
10352+
else if (Token::simpleMatch(tok->next(), "(")) {
1034910353
if (TokenList::isFunctionHead(tok->next(), "{"))
1035010354
userFunctions.insert(tok->str());
1035110355
else if (TokenList::isFunctionHead(tok->next(), ";")) {
@@ -10360,10 +10364,6 @@ void Tokenizer::simplifyNamespaceStd()
1036010364
} else if (Token::simpleMatch(tok->next(), "<") &&
1036110365
(isStdContainerOrIterator(tok, mSettings) || isStdSmartPointer(tok, mSettings)))
1036210366
insert = true;
10363-
else if (mSettings.library.hasAnyTypeCheck("std::" + tok->str()) ||
10364-
mSettings.library.podtype("std::" + tok->str()) ||
10365-
isStdContainerOrIterator(tok, mSettings))
10366-
insert = true;
1036710367
else if (Token::simpleMatch(tok, "aligned_storage"))
1036810368
insert = true;
1036910369

0 commit comments

Comments
 (0)