Fixed (for real) the preprocessor.cpp(1166) warning in #2123.

cli/cppcheckexecutor.cpp

@@ -237,7 +237,7 @@ void CppCheckExecutor::reportOut(const std::string &outmsg)
     std::cout << outmsg << std::endl;
 }
 
-void CppCheckExecutor::reportProgress(const std::string &filename, const char stage[], const unsigned int value)
+void CppCheckExecutor::reportProgress(const std::string &filename, const char stage[], const size_t value)
 {
     (void)filename;
 
@@ -256,7 +256,7 @@ void CppCheckExecutor::reportProgress(const std::string &filename, const char st
         std::ostringstream ostr;
         ostr << "progress: "
              << stage
-             << ' ' << int(value) << '%';
+             << ' ' << value << '%';
         if (_settings->_verbose)
             ostr << " time=" << str.substr(11, 8);
 

cli/cppcheckexecutor.h

@@ -70,7 +70,7 @@ public:
     /** xml output of errors */
     virtual void reportErr(const ErrorLogger::ErrorMessage &msg);
 
-    void reportProgress(const std::string &filename, const char stage[], const unsigned int value);
+    void reportProgress(const std::string &filename, const char stage[], const size_t value);
 
     /**
      * Output information messages.

lib/cppcheck.cpp

@@ -506,7 +506,7 @@ void CppCheck::reportOut(const std::string &outmsg)
     _errorLogger.reportOut(outmsg);
 }
 
-void CppCheck::reportProgress(const std::string &filename, const char stage[], const unsigned int value)
+void CppCheck::reportProgress(const std::string &filename, const char stage[], const size_t value)
 {
     _errorLogger.reportProgress(filename, stage, value);
 }

lib/cppcheck.h

@@ -173,7 +173,7 @@ private:
     std::string _fileContent;
     std::set<std::string> _dependencies;
 
-    void reportProgress(const std::string &filename, const char stage[], const unsigned int value);
+    void reportProgress(const std::string &filename, const char stage[], const size_t value);
 
     /**
      * Output information messages.

lib/errorlogger.h

@@ -276,7 +276,7 @@ public:
      * @param stage for example preprocess / tokenize / simplify / check
      * @param value progress value (0-100)
      */
-    virtual void reportProgress(const std::string &filename, const char stage[], const unsigned int value) {
+    virtual void reportProgress(const std::string &filename, const char stage[], const size_t value) {
         (void)filename;
         (void)stage;
         (void)value;

lib/preprocessor.cpp

@@ -1160,7 +1160,7 @@ std::list<std::string> Preprocessor::getcfgs(const std::string &filedata, const
     }
 
     // Remove defined constants from ifdef configurations..
-    unsigned int count = 0;
+    size_t count = 0;
     for (std::list<std::string>::iterator it = ret.begin(); it != ret.end(); ++it) {
         if (_errorLogger)
             _errorLogger->reportProgress(filename, "Preprocessing (get configurations 2)", (100 * count++) / ret.size());