own

Author: firewave

lib/cppcheck.cpp

@@ -743,7 +743,7 @@ unsigned int CppCheck::checkFile(const std::string& filename, const std::string
         }
 
         // Parse comments and then remove them
-        preprocessor.inlineSuppressions(tokens1, mSettings.nomsg);
+        preprocessor.inlineSuppressions(tokens1, mSuppressions);
         if (mSettings.dump || !mSettings.addons.empty()) {
             mSuppressions.dump(dumpProlog);
         }

test/testpreprocessor.cpp

@@ -1963,16 +1963,16 @@ class TestPreprocessor : public TestFixture {
         auto suppressions = inlineSuppr.getSuppressions();
         ASSERT_EQUALS(2, suppressions.size());
 
-        auto suppr = supprs.front();
-        supprs.pop_front();
+        auto suppr = suppressions.front();
+        suppressions.pop_front();
         ASSERT_EQUALS("missingInclude", suppr.errorId);
         ASSERT_EQUALS("test.c", suppr.fileName);
         ASSERT_EQUALS(2, suppr.lineNumber);
         ASSERT_EQUALS(false, suppr.checked);
         ASSERT_EQUALS(false, suppr.matched);
 
-        suppr = supprs.front();
-        supprs.pop_front();
+        suppr = suppressions.front();
+        suppressions.pop_front();
         ASSERT_EQUALS("missingIncludeSystem", suppr.errorId);
         ASSERT_EQUALS("test.c", suppr.fileName);
         ASSERT_EQUALS(4, suppr.lineNumber);