Skip to content

Commit 1ba4b70

Browse files
committed
Fix clang-tidy issues
1 parent cb350c0 commit 1ba4b70

4 files changed

Lines changed: 3 additions & 10 deletions

File tree

lib/cppcheck.cpp

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1038,7 +1038,7 @@ unsigned int CppCheck::checkInternal(const FileWithDetails& file, const std::str
10381038
// Get directives
10391039
std::list<Directive> directives;
10401040
Preprocessor::createDirectives(tokens1, directives);
1041-
preprocessor.simplifyPragmaAsm(tokens1);
1041+
Preprocessor::simplifyPragmaAsm(tokens1);
10421042

10431043
// This needs to be a linked list to allow new configurations to be discovered
10441044
// and added while iterating and checking existing configurations
@@ -1051,7 +1051,7 @@ unsigned int CppCheck::checkInternal(const FileWithDetails& file, const std::str
10511051
preprocessor.inlineSuppressions(data.tokens, mSuppressions.nomsg);
10521052
Preprocessor::removeComments(data.tokens);
10531053
Preprocessor::createDirectives(data.tokens, directives);
1054-
preprocessor.simplifyPragmaAsm(data.tokens);
1054+
Preprocessor::simplifyPragmaAsm(data.tokens);
10551055
// Discover new configurations from included file
10561056
if ((mSettings.checkAllConfigurations && mSettings.userDefines.empty()) || mSettings.force)
10571057
preprocessor.getConfigs(data.filename, data.tokens, configDefines, configurations);

lib/preprocessor.cpp

Lines changed: 0 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -971,11 +971,6 @@ std::size_t Preprocessor::calculateHash(const simplecpp::TokenList &tokens1, con
971971
}
972972

973973
void Preprocessor::simplifyPragmaAsm(simplecpp::TokenList &tokenList)
974-
{
975-
Preprocessor::simplifyPragmaAsmPrivate(tokenList);
976-
}
977-
978-
void Preprocessor::simplifyPragmaAsmPrivate(simplecpp::TokenList &tokenList)
979974
{
980975
// assembler code..
981976
for (simplecpp::Token *tok = tokenList.front(); tok; tok = tok->next) {

lib/preprocessor.h

Lines changed: 0 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -159,8 +159,6 @@ class CPPCHECKLIB WARN_UNUSED Preprocessor {
159159

160160
void reportOutput(const simplecpp::OutputList &outputList, bool showerror);
161161

162-
static void simplifyPragmaAsmPrivate(simplecpp::TokenList &tokenList);
163-
164162
/**
165163
* Include file types.
166164
*/

test/testpreprocessor.cpp

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -123,7 +123,7 @@ class TestPreprocessor : public TestFixture {
123123
if (inlineSuppression)
124124
preprocessor.inlineSuppressions(tokens, *inlineSuppression);
125125
Preprocessor::removeComments(tokens);
126-
preprocessor.simplifyPragmaAsm(tokens);
126+
Preprocessor::simplifyPragmaAsm(tokens);
127127

128128
preprocessor.reportOutput(outputList, true);
129129

0 commit comments

Comments
 (0)