Merge branch 'master' of git@github.com:danmar/cppcheck

2009-07-02 23:43:17 +03:00 · 2009-07-02 23:43:17 +03:00 · e76b9b974c
parent 7a4115236a ea0035ec3a
commit e76b9b974c
1 changed files with 5 additions and 0 deletions
--- a/src/cppcheck.cpp
+++ b/src/cppcheck.cpp
@ -248,6 +248,11 @@ std::string CppCheck::parseFromArgs(int argc, const char* const argv[])
            pathnames.push_back(argv[i]);
    }

+    if (_settings._unusedFunctions && _settings._jobs > 1)
+    {
+        return "cppcheck: error: --unused-functions can't be used with -j option.\n";
+    }
+
    if (pathnames.size() > 0)
    {
        // Execute RecursiveAddFiles() to each given file parameter