diff options
| author | Sean McBride <sean@rogue-research.com> | 2019-01-11 21:58:56 (GMT) |
|---|---|---|
| committer | Brad King <brad.king@kitware.com> | 2019-01-15 19:09:46 (GMT) |
| commit | b056bc34258267c4ae59c72e3777d0a0f0b5a1b1 (patch) | |
| tree | aa1632cdb773244aa402c0cf7ccd4f6e53a28536 /Source/CTest | |
| parent | da566d4de885130e182edc80f13691f5ca24bb61 (diff) | |
| download | CMake-b056bc34258267c4ae59c72e3777d0a0f0b5a1b1.zip CMake-b056bc34258267c4ae59c72e3777d0a0f0b5a1b1.tar.gz CMake-b056bc34258267c4ae59c72e3777d0a0f0b5a1b1.tar.bz2 | |
Fix most clang -Wextra-semi-stmt warnings in C++ files
Suppress one in code generated by flex.
Diffstat (limited to 'Source/CTest')
| -rw-r--r-- | Source/CTest/cmCTestBuildHandler.cxx | 18 | ||||
| -rw-r--r-- | Source/CTest/cmCTestCoverageHandler.cxx | 1 |
2 files changed, 11 insertions, 8 deletions
diff --git a/Source/CTest/cmCTestBuildHandler.cxx b/Source/CTest/cmCTestBuildHandler.cxx index 539a0ce..361883c 100644 --- a/Source/CTest/cmCTestBuildHandler.cxx +++ b/Source/CTest/cmCTestBuildHandler.cxx @@ -357,14 +357,18 @@ int cmCTestBuildHandler::ProcessHandler() // Pre-compile regular expressions objects for all regular expressions #define cmCTestBuildHandlerPopulateRegexVector(strings, regexes) \ - regexes.clear(); \ - cmCTestOptionalLog(this->CTest, DEBUG, \ - this << "Add " #regexes << std::endl, this->Quiet); \ - for (std::string const& s : (strings)) { \ + do { \ + regexes.clear(); \ cmCTestOptionalLog(this->CTest, DEBUG, \ - "Add " #strings ": " << s << std::endl, this->Quiet); \ - (regexes).push_back(s.c_str()); \ - } + this << "Add " #regexes << std::endl, this->Quiet); \ + for (std::string const& s : (strings)) { \ + cmCTestOptionalLog(this->CTest, DEBUG, \ + "Add " #strings ": " << s << std::endl, \ + this->Quiet); \ + (regexes).push_back(s.c_str()); \ + } \ + } while (false) + cmCTestBuildHandlerPopulateRegexVector(this->CustomErrorMatches, this->ErrorMatchRegex); cmCTestBuildHandlerPopulateRegexVector(this->CustomErrorExceptions, diff --git a/Source/CTest/cmCTestCoverageHandler.cxx b/Source/CTest/cmCTestCoverageHandler.cxx index 1d9a5f7..fbd1038 100644 --- a/Source/CTest/cmCTestCoverageHandler.cxx +++ b/Source/CTest/cmCTestCoverageHandler.cxx @@ -57,7 +57,6 @@ public: { this->CommandLineStrings.clear(); this->CommandLineStrings.push_back(command); - ; } void AddArgument(const char* arg) { |