Fix merge issues

Author: glankk

lib/cppcheck.cpp

@@ -1062,16 +1062,18 @@ unsigned int CppCheck::checkInternal(const FileWithDetails& file, const std::str
                        std::inserter(configDefines, configDefines.end()),
                        getDefineName);
 
-        preprocessor.setLoadCallback([&](simplecpp::FileData &data) {
-            // Do preprocessing on included file
-            mLogger->addRemarkComments(preprocessor.getRemarkComments(data.tokens));
-            preprocessor.inlineSuppressions(data.tokens, mSuppressions.nomsg);
-            Preprocessor::removeComments(data.tokens);
-            Preprocessor::createDirectives(data.tokens, directives);
-            Preprocessor::simplifyPragmaAsm(data.tokens);
-            // Discover new configurations from included file
-            if (configurations.size() < maxConfigs)
-                preprocessor.getConfigs(data.filename, data.tokens, configDefines, configurations);
+        preprocessor.setLoadCallback([&](simplecpp::FileData &data, bool loaded) {
+            if (loaded) {
+                // Do preprocessing on included file
+                mLogger->addRemarkComments(preprocessor.getRemarkComments(data.tokens));
+                preprocessor.inlineSuppressions(data.tokens, mSuppressions.nomsg);
+                Preprocessor::removeComments(data.tokens);
+                Preprocessor::createDirectives(data.tokens, directives);
+                Preprocessor::simplifyPragmaAsm(data.tokens);
+                // Discover new configurations from included file
+                if (configurations.size() < maxConfigs)
+                    preprocessor.getConfigs(data.filename, data.tokens, configDefines, configurations);
+            }
         });
 
         preprocessor.setPlatformInfo();

test/testpreprocessor.cpp

@@ -411,9 +411,11 @@ class TestPreprocessor : public TestFixture {
                        settings.library.defines().end(),
                        std::inserter(configDefines, configDefines.end()),
                        getDefineName);
-        preprocessor.setLoadCallback([&](simplecpp::FileData &data) {
-            Preprocessor::removeComments(data.tokens);
-            preprocessor.getConfigs(data.filename, data.tokens, configDefines, configs);
+        preprocessor.setLoadCallback([&](simplecpp::FileData &data, bool loaded) {
+            if (loaded) {
+                Preprocessor::removeComments(data.tokens);
+                preprocessor.getConfigs(data.filename, data.tokens, configDefines, configs);
+            }
         });
         preprocessor.removeComments();
         preprocessor.getConfigs(configDefines, configs);
@@ -430,8 +432,10 @@ class TestPreprocessor : public TestFixture {
         std::vector<std::string> files;
         simplecpp::TokenList tokens(code,files,"test.c");
         Preprocessor preprocessor(tokens, settingsDefault, *this, Standards::Language::C);
-        preprocessor.setLoadCallback([](simplecpp::FileData &data) {
-            Preprocessor::removeComments(data.tokens);
+        preprocessor.setLoadCallback([](simplecpp::FileData &data, bool loaded) {
+            if (loaded) {
+                Preprocessor::removeComments(data.tokens);
+            }
         });
         preprocessor.removeComments();
         ASSERT(preprocessor.loadFiles(files));

test/testtokenize.cpp

@@ -608,8 +608,10 @@ class TestTokenizer : public TestFixture {
         simplecpp::TokenList tokens1(code, files, filename, {}, &outputList);
         Preprocessor preprocessor(tokens1, settings, *this, Path::identify(tokens1.getFiles()[0], false));
         std::list<Directive> directives;
-        preprocessor.setLoadCallback([&](const simplecpp::FileData &data) {
-            Preprocessor::createDirectives(data.tokens, directives);
+        preprocessor.setLoadCallback([&](const simplecpp::FileData &data, bool loaded) {
+            if (loaded) {
+                Preprocessor::createDirectives(data.tokens, directives);
+            }
         });
         preprocessor.createDirectives(directives);
         ASSERT(preprocessor.loadFiles(files));