diff options
author | Daniel Pfeifer <daniel@pfeifer-mail.de> | 2016-08-16 23:49:57 (GMT) |
---|---|---|
committer | Daniel Pfeifer <daniel@pfeifer-mail.de> | 2016-08-16 23:49:57 (GMT) |
commit | e7b842e18955d13f6d9c021bab4a8935bf282744 (patch) | |
tree | afa5a21f85b46b54b541d914236ae61400c83ae4 /Source/CTest | |
parent | e240a7c0176450e092e2398148c1e13f8940c239 (diff) | |
download | CMake-e7b842e18955d13f6d9c021bab4a8935bf282744.zip CMake-e7b842e18955d13f6d9c021bab4a8935bf282744.tar.gz CMake-e7b842e18955d13f6d9c021bab4a8935bf282744.tar.bz2 |
Make sure unnused parameters are /*named*/
Diffstat (limited to 'Source/CTest')
-rw-r--r-- | Source/CTest/cmCTestBZR.cxx | 6 | ||||
-rw-r--r-- | Source/CTest/cmCTestBuildAndTestHandler.cxx | 5 | ||||
-rw-r--r-- | Source/CTest/cmCTestCurl.cxx | 4 | ||||
-rw-r--r-- | Source/CTest/cmCTestEmptyBinaryDirectoryCommand.cxx | 2 | ||||
-rw-r--r-- | Source/CTest/cmCTestHG.cxx | 2 | ||||
-rw-r--r-- | Source/CTest/cmCTestHandlerCommand.cxx | 2 | ||||
-rw-r--r-- | Source/CTest/cmCTestMemCheckHandler.cxx | 2 | ||||
-rw-r--r-- | Source/CTest/cmCTestReadCustomFilesCommand.cxx | 2 | ||||
-rw-r--r-- | Source/CTest/cmCTestRunScriptCommand.cxx | 2 | ||||
-rw-r--r-- | Source/CTest/cmCTestSVN.cxx | 2 | ||||
-rw-r--r-- | Source/CTest/cmCTestScriptHandler.cxx | 11 | ||||
-rw-r--r-- | Source/CTest/cmCTestSleepCommand.cxx | 2 | ||||
-rw-r--r-- | Source/CTest/cmCTestStartCommand.cxx | 2 | ||||
-rw-r--r-- | Source/CTest/cmCTestSubmitHandler.cxx | 10 | ||||
-rw-r--r-- | Source/CTest/cmCTestTestHandler.cxx | 23 | ||||
-rw-r--r-- | Source/CTest/cmCTestVC.cxx | 2 | ||||
-rw-r--r-- | Source/CTest/cmParseJacocoCoverage.cxx | 2 |
17 files changed, 42 insertions, 39 deletions
diff --git a/Source/CTest/cmCTestBZR.cxx b/Source/CTest/cmCTestBZR.cxx index 0e08e1c..7baf7a3 100644 --- a/Source/CTest/cmCTestBZR.cxx +++ b/Source/CTest/cmCTestBZR.cxx @@ -19,7 +19,7 @@ #include <cm_expat.h> -extern "C" int cmBZRXMLParserUnknownEncodingHandler(void*, +extern "C" int cmBZRXMLParserUnknownEncodingHandler(void* /*unused*/, const XML_Char* name, XML_Encoding* info) { @@ -215,7 +215,7 @@ private: return true; } - void StartElement(const std::string& name, const char**) CM_OVERRIDE + void StartElement(const std::string& name, const char** /*atts*/) CM_OVERRIDE { this->CData.clear(); if (name == "log") { @@ -275,7 +275,7 @@ private: this->CData.clear(); } - void ReportError(int, int, const char* msg) CM_OVERRIDE + void ReportError(int /*line*/, int /*column*/, const char* msg) CM_OVERRIDE { this->BZR->Log << "Error parsing bzr log xml: " << msg << "\n"; } diff --git a/Source/CTest/cmCTestBuildAndTestHandler.cxx b/Source/CTest/cmCTestBuildAndTestHandler.cxx index eddbddc..9dab98a 100644 --- a/Source/CTest/cmCTestBuildAndTestHandler.cxx +++ b/Source/CTest/cmCTestBuildAndTestHandler.cxx @@ -123,14 +123,15 @@ int cmCTestBuildAndTestHandler::RunCMake(std::string* outstring, return 0; } -void CMakeMessageCallback(const char* m, const char*, bool&, void* s) +void CMakeMessageCallback(const char* m, const char* /*unused*/, + bool& /*unused*/, void* s) { std::string* out = (std::string*)s; *out += m; *out += "\n"; } -void CMakeProgressCallback(const char* msg, float, void* s) +void CMakeProgressCallback(const char* msg, float /*unused*/, void* s) { std::string* out = (std::string*)s; *out += msg; diff --git a/Source/CTest/cmCTestCurl.cxx b/Source/CTest/cmCTestCurl.cxx index b335e32..6910f6f 100644 --- a/Source/CTest/cmCTestCurl.cxx +++ b/Source/CTest/cmCTestCurl.cxx @@ -54,8 +54,8 @@ static size_t curlWriteMemoryCallback(void* ptr, size_t size, size_t nmemb, return realsize; } -static size_t curlDebugCallback(CURL*, curl_infotype, char* chPtr, size_t size, - void* data) +static size_t curlDebugCallback(CURL* /*unused*/, curl_infotype /*unused*/, + char* chPtr, size_t size, void* data) { std::vector<char>* vec = static_cast<std::vector<char>*>(data); vec->insert(vec->end(), chPtr, chPtr + size); diff --git a/Source/CTest/cmCTestEmptyBinaryDirectoryCommand.cxx b/Source/CTest/cmCTestEmptyBinaryDirectoryCommand.cxx index 1bda9be..09ae1fc 100644 --- a/Source/CTest/cmCTestEmptyBinaryDirectoryCommand.cxx +++ b/Source/CTest/cmCTestEmptyBinaryDirectoryCommand.cxx @@ -14,7 +14,7 @@ #include "cmCTestScriptHandler.h" bool cmCTestEmptyBinaryDirectoryCommand::InitialPass( - std::vector<std::string> const& args, cmExecutionStatus&) + std::vector<std::string> const& args, cmExecutionStatus& /*unused*/) { if (args.size() != 1) { this->SetError("called with incorrect number of arguments"); diff --git a/Source/CTest/cmCTestHG.cxx b/Source/CTest/cmCTestHG.cxx index eb3d611..3e62a1a 100644 --- a/Source/CTest/cmCTestHG.cxx +++ b/Source/CTest/cmCTestHG.cxx @@ -261,7 +261,7 @@ private: return output; } - void ReportError(int, int, const char* msg) CM_OVERRIDE + void ReportError(int /*line*/, int /*column*/, const char* msg) CM_OVERRIDE { this->HG->Log << "Error parsing hg log xml: " << msg << "\n"; } diff --git a/Source/CTest/cmCTestHandlerCommand.cxx b/Source/CTest/cmCTestHandlerCommand.cxx index e1361a1..325f8a3 100644 --- a/Source/CTest/cmCTestHandlerCommand.cxx +++ b/Source/CTest/cmCTestHandlerCommand.cxx @@ -32,7 +32,7 @@ cmCTestHandlerCommand::cmCTestHandlerCommand() } bool cmCTestHandlerCommand::InitialPass(std::vector<std::string> const& args, - cmExecutionStatus&) + cmExecutionStatus& /*unused*/) { // Allocate space for argument values. this->Values.clear(); diff --git a/Source/CTest/cmCTestMemCheckHandler.cxx b/Source/CTest/cmCTestMemCheckHandler.cxx index dfa8a1a..a06c351 100644 --- a/Source/CTest/cmCTestMemCheckHandler.cxx +++ b/Source/CTest/cmCTestMemCheckHandler.cxx @@ -78,7 +78,7 @@ public: ostr << "\n"; this->Log += ostr.str(); } - void EndElement(const std::string&) CM_OVERRIDE {} + void EndElement(const std::string& /*name*/) CM_OVERRIDE {} const char* GetAttribute(const char* name, const char** atts) { diff --git a/Source/CTest/cmCTestReadCustomFilesCommand.cxx b/Source/CTest/cmCTestReadCustomFilesCommand.cxx index fec23e9..24e985d 100644 --- a/Source/CTest/cmCTestReadCustomFilesCommand.cxx +++ b/Source/CTest/cmCTestReadCustomFilesCommand.cxx @@ -14,7 +14,7 @@ #include "cmCTest.h" bool cmCTestReadCustomFilesCommand::InitialPass( - std::vector<std::string> const& args, cmExecutionStatus&) + std::vector<std::string> const& args, cmExecutionStatus& /*unused*/) { if (args.empty()) { this->SetError("called with incorrect number of arguments"); diff --git a/Source/CTest/cmCTestRunScriptCommand.cxx b/Source/CTest/cmCTestRunScriptCommand.cxx index 6b5e6ed..32bf28f 100644 --- a/Source/CTest/cmCTestRunScriptCommand.cxx +++ b/Source/CTest/cmCTestRunScriptCommand.cxx @@ -14,7 +14,7 @@ #include "cmCTestScriptHandler.h" bool cmCTestRunScriptCommand::InitialPass(std::vector<std::string> const& args, - cmExecutionStatus&) + cmExecutionStatus& /*unused*/) { if (args.empty()) { this->CTestScriptHandler->RunCurrentScript(); diff --git a/Source/CTest/cmCTestSVN.cxx b/Source/CTest/cmCTestSVN.cxx index eae0c6c..06f838c 100644 --- a/Source/CTest/cmCTestSVN.cxx +++ b/Source/CTest/cmCTestSVN.cxx @@ -372,7 +372,7 @@ private: this->CData.clear(); } - void ReportError(int, int, const char* msg) CM_OVERRIDE + void ReportError(int /*line*/, int /*column*/, const char* msg) CM_OVERRIDE { this->SVN->Log << "Error parsing svn log xml: " << msg << "\n"; } diff --git a/Source/CTest/cmCTestScriptHandler.cxx b/Source/CTest/cmCTestScriptHandler.cxx index b747c64..44427b0 100644 --- a/Source/CTest/cmCTestScriptHandler.cxx +++ b/Source/CTest/cmCTestScriptHandler.cxx @@ -61,7 +61,7 @@ public: cmCTestScriptFunctionBlocker() {} ~cmCTestScriptFunctionBlocker() CM_OVERRIDE {} bool IsFunctionBlocked(const cmListFileFunction& lff, cmMakefile& mf, - cmExecutionStatus&) CM_OVERRIDE; + cmExecutionStatus& /*status*/) CM_OVERRIDE; // virtual bool ShouldRemove(const cmListFileFunction& lff, cmMakefile &mf); // virtual void ScopeEnded(cmMakefile &mf); @@ -69,9 +69,9 @@ public: }; // simply update the time and don't block anything -bool cmCTestScriptFunctionBlocker::IsFunctionBlocked(const cmListFileFunction&, - cmMakefile&, - cmExecutionStatus&) +bool cmCTestScriptFunctionBlocker::IsFunctionBlocked( + const cmListFileFunction& /*lff*/, cmMakefile& /*mf*/, + cmExecutionStatus& /*status*/) { this->CTestScriptHandler->UpdateElapsedTime(); return false; @@ -265,7 +265,8 @@ int cmCTestScriptHandler::ExecuteScript(const std::string& total_script_arg) return retVal; } -static void ctestScriptProgressCallback(const char* m, float, void* cd) +static void ctestScriptProgressCallback(const char* m, float /*unused*/, + void* cd) { cmCTest* ctest = static_cast<cmCTest*>(cd); if (m && *m) { diff --git a/Source/CTest/cmCTestSleepCommand.cxx b/Source/CTest/cmCTestSleepCommand.cxx index a6dd6bc..464f025 100644 --- a/Source/CTest/cmCTestSleepCommand.cxx +++ b/Source/CTest/cmCTestSleepCommand.cxx @@ -15,7 +15,7 @@ #include <stdlib.h> // required for atoi bool cmCTestSleepCommand::InitialPass(std::vector<std::string> const& args, - cmExecutionStatus&) + cmExecutionStatus& /*unused*/) { if (args.empty()) { this->SetError("called with incorrect number of arguments"); diff --git a/Source/CTest/cmCTestStartCommand.cxx b/Source/CTest/cmCTestStartCommand.cxx index c64d16b..04d2f03 100644 --- a/Source/CTest/cmCTestStartCommand.cxx +++ b/Source/CTest/cmCTestStartCommand.cxx @@ -23,7 +23,7 @@ cmCTestStartCommand::cmCTestStartCommand() } bool cmCTestStartCommand::InitialPass(std::vector<std::string> const& args, - cmExecutionStatus&) + cmExecutionStatus& /*unused*/) { if (args.empty()) { this->SetError("called with incorrect number of arguments"); diff --git a/Source/CTest/cmCTestSubmitHandler.cxx b/Source/CTest/cmCTestSubmitHandler.cxx index 67388ad..42727d0 100644 --- a/Source/CTest/cmCTestSubmitHandler.cxx +++ b/Source/CTest/cmCTestSubmitHandler.cxx @@ -116,7 +116,8 @@ static size_t cmCTestSubmitHandlerWriteMemoryCallback(void* ptr, size_t size, return realsize; } -static size_t cmCTestSubmitHandlerCurlDebugCallback(CURL*, curl_infotype, +static size_t cmCTestSubmitHandlerCurlDebugCallback(CURL* /*unused*/, + curl_infotype /*unused*/, char* chPtr, size_t size, void* data) { @@ -976,10 +977,9 @@ bool cmCTestSubmitHandler::SubmitUsingXMLRPC( return true; } #else -bool cmCTestSubmitHandler::SubmitUsingXMLRPC(std::string const&, - std::set<std::string> const&, - std::string const&, - std::string const&) +bool cmCTestSubmitHandler::SubmitUsingXMLRPC( + std::string const& /*unused*/, std::set<std::string> const& /*unused*/, + std::string const& /*unused*/, std::string const& /*unused*/) { return false; } diff --git a/Source/CTest/cmCTestTestHandler.cxx b/Source/CTest/cmCTestTestHandler.cxx index cd250fb..b932277 100644 --- a/Source/CTest/cmCTestTestHandler.cxx +++ b/Source/CTest/cmCTestTestHandler.cxx @@ -54,7 +54,7 @@ public: * the CMakeLists.txt file. */ bool InitialPass(std::vector<std::string> const& args, - cmExecutionStatus&) CM_OVERRIDE; + cmExecutionStatus& /*unused*/) CM_OVERRIDE; /** * The name of the command as specified in CMakeList.txt. @@ -67,7 +67,7 @@ public: }; bool cmCTestSubdirCommand::InitialPass(std::vector<std::string> const& args, - cmExecutionStatus&) + cmExecutionStatus& /*unused*/) { if (args.empty()) { this->SetError("called with incorrect number of arguments"); @@ -135,7 +135,7 @@ public: * the CMakeLists.txt file. */ bool InitialPass(std::vector<std::string> const& args, - cmExecutionStatus&) CM_OVERRIDE; + cmExecutionStatus& /*unused*/) CM_OVERRIDE; /** * The name of the command as specified in CMakeList.txt. @@ -148,7 +148,7 @@ public: }; bool cmCTestAddSubdirectoryCommand::InitialPass( - std::vector<std::string> const& args, cmExecutionStatus&) + std::vector<std::string> const& args, cmExecutionStatus& /*unused*/) { if (args.empty()) { this->SetError("called with incorrect number of arguments"); @@ -208,8 +208,8 @@ public: * This is called when the command is first encountered in * the CMakeLists.txt file. */ - bool InitialPass(std::vector<std::string> const&, - cmExecutionStatus&) CM_OVERRIDE; + bool InitialPass(std::vector<std::string> const& /*args*/, + cmExecutionStatus& /*unused*/) CM_OVERRIDE; /** * The name of the command as specified in CMakeList.txt. @@ -222,7 +222,7 @@ public: }; bool cmCTestAddTestCommand::InitialPass(std::vector<std::string> const& args, - cmExecutionStatus&) + cmExecutionStatus& /*unused*/) { if (args.size() < 2) { this->SetError("called with incorrect number of arguments"); @@ -248,8 +248,8 @@ public: * This is called when the command is first encountered in * the CMakeLists.txt file. */ - bool InitialPass(std::vector<std::string> const&, - cmExecutionStatus&) CM_OVERRIDE; + bool InitialPass(std::vector<std::string> const& /*args*/, + cmExecutionStatus& /*unused*/) CM_OVERRIDE; /** * The name of the command as specified in CMakeList.txt. @@ -262,7 +262,7 @@ public: }; bool cmCTestSetTestsPropertiesCommand::InitialPass( - std::vector<std::string> const& args, cmExecutionStatus&) + std::vector<std::string> const& args, cmExecutionStatus& /*unused*/) { return this->TestHandler->SetTestsProperties(args); } @@ -986,7 +986,8 @@ void cmCTestTestHandler::ProcessDirectory(std::vector<std::string>& passed, *this->LogFile << "End testing: " << this->CTest->CurrentTime() << std::endl; } -void cmCTestTestHandler::GenerateTestCommand(std::vector<std::string>&, int) +void cmCTestTestHandler::GenerateTestCommand( + std::vector<std::string>& /*unused*/, int /*unused*/) { } diff --git a/Source/CTest/cmCTestVC.cxx b/Source/CTest/cmCTestVC.cxx index 3376588..24557aa 100644 --- a/Source/CTest/cmCTestVC.cxx +++ b/Source/CTest/cmCTestVC.cxx @@ -185,7 +185,7 @@ bool cmCTestVC::WriteXML(cmXMLWriter& xml) return result; } -bool cmCTestVC::WriteXMLUpdates(cmXMLWriter&) +bool cmCTestVC::WriteXMLUpdates(cmXMLWriter& /*unused*/) { cmCTestLog(this->CTest, HANDLER_VERBOSE_OUTPUT, "* CTest cannot extract updates for this VCS tool.\n"); diff --git a/Source/CTest/cmParseJacocoCoverage.cxx b/Source/CTest/cmParseJacocoCoverage.cxx index 9325812..bc05666 100644 --- a/Source/CTest/cmParseJacocoCoverage.cxx +++ b/Source/CTest/cmParseJacocoCoverage.cxx @@ -23,7 +23,7 @@ public: ~XMLParser() CM_OVERRIDE {} protected: - void EndElement(const std::string&) CM_OVERRIDE {} + void EndElement(const std::string& /*name*/) CM_OVERRIDE {} void StartElement(const std::string& name, const char** atts) CM_OVERRIDE { |