Skip to content

Commit 506847e

Browse files
committed
Fix formatting
1 parent f4b4b71 commit 506847e

2 files changed

Lines changed: 9 additions & 2 deletions

File tree

lib/cppcheck.cpp

Lines changed: 4 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1050,10 +1050,13 @@ unsigned int CppCheck::checkInternal(const FileWithDetails& file, const std::str
10501050
std::set<std::string> configDefines = { "__cplusplus" };
10511051

10521052
// Insert library defines
1053+
const auto getDefineName = [](const std::string &defineString) {
1054+
return defineString.substr(0, defineString.find_first_of("( "));
1055+
};
10531056
std::transform(mSettings.library.defines().begin(),
10541057
mSettings.library.defines().end(),
10551058
std::inserter(configDefines, configDefines.end()),
1056-
[](const std::string &define) { return define.substr(0, define.find_first_of("( ")); });
1059+
getDefineName);
10571060

10581061
preprocessor.setLoadCallback([&](simplecpp::FileData &data) {
10591062
// Do preprocessing on included file

test/testpreprocessor.cpp

Lines changed: 5 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -32,6 +32,7 @@
3232
#include "fixture.h"
3333
#include "helpers.h"
3434

35+
#include <algorithm>
3536
#include <cstring>
3637
#include <iterator>
3738
#include <list>
@@ -402,10 +403,13 @@ class TestPreprocessor : public TestFixture {
402403
Preprocessor preprocessor(tokens, settings, *this, Standards::Language::C);
403404
std::set<std::string> configs = { "" };
404405
std::set<std::string> configDefines = { "__cplusplus" };
406+
const auto getDefineName = [](const std::string &defineString) {
407+
return defineString.substr(0, defineString.find_first_of("( "));
408+
};
405409
std::transform(settings.library.defines().begin(),
406410
settings.library.defines().end(),
407411
std::inserter(configDefines, configDefines.end()),
408-
[](const std::string &define) { return define.substr(0, define.find_first_of("( ")); });
412+
getDefineName);
409413
preprocessor.setLoadCallback([&](simplecpp::FileData &data) {
410414
Preprocessor::removeComments(data.tokens);
411415
preprocessor.getConfigs(data.filename, data.tokens, configDefines, configs);

0 commit comments

Comments
 (0)