diff options
author | Kitware Robot <kwrobot@kitware.com> | 2016-05-16 14:34:04 (GMT) |
---|---|---|
committer | Brad King <brad.king@kitware.com> | 2016-05-16 20:05:19 (GMT) |
commit | d9fd2f5402eeaa345691313658e02b51038f570b (patch) | |
tree | dca71b9a7e267f4c6300da3eb770415381726785 /Source/cmSetTestsPropertiesCommand.cxx | |
parent | 82df6deaafb36cbbfd450202bb20b320f637751a (diff) | |
download | CMake-d9fd2f5402eeaa345691313658e02b51038f570b.zip CMake-d9fd2f5402eeaa345691313658e02b51038f570b.tar.gz CMake-d9fd2f5402eeaa345691313658e02b51038f570b.tar.bz2 |
Revise C++ coding style using clang-format
Run the `Utilities/Scripts/clang-format.bash` script to update
all our C++ code to a new style defined by `.clang-format`.
Use `clang-format` version 3.8.
* If you reached this commit for a line in `git blame`, re-run the blame
operation starting at the parent of this commit to see older history
for the content.
* See the parent commit for instructions to rebase a change across this
style transition commit.
Diffstat (limited to 'Source/cmSetTestsPropertiesCommand.cxx')
-rw-r--r-- | Source/cmSetTestsPropertiesCommand.cxx | 71 |
1 files changed, 26 insertions, 45 deletions
diff --git a/Source/cmSetTestsPropertiesCommand.cxx b/Source/cmSetTestsPropertiesCommand.cxx index 70c34c4..2fb137f 100644 --- a/Source/cmSetTestsPropertiesCommand.cxx +++ b/Source/cmSetTestsPropertiesCommand.cxx @@ -15,89 +15,70 @@ #include "cmake.h" // cmSetTestsPropertiesCommand -bool cmSetTestsPropertiesCommand -::InitialPass(std::vector<std::string> const& args, cmExecutionStatus &) +bool cmSetTestsPropertiesCommand::InitialPass( + std::vector<std::string> const& args, cmExecutionStatus&) { - if(args.size() < 1 ) - { + if (args.size() < 1) { this->SetError("called with incorrect number of arguments"); return false; - } + } // first collect up the list of files std::vector<std::string> propertyPairs; int numFiles = 0; std::vector<std::string>::const_iterator j; - for(j= args.begin(); j != args.end();++j) - { - if(*j == "PROPERTIES") - { + for (j = args.begin(); j != args.end(); ++j) { + if (*j == "PROPERTIES") { // now loop through the rest of the arguments, new style ++j; - if (std::distance(j, args.end()) % 2 != 0) - { + if (std::distance(j, args.end()) % 2 != 0) { this->SetError("called with incorrect number of arguments."); return false; - } + } propertyPairs.insert(propertyPairs.end(), j, args.end()); break; - } - else - { + } else { numFiles++; - } } - if(propertyPairs.empty()) - { + } + if (propertyPairs.empty()) { this->SetError("called with illegal arguments, maybe " "missing a PROPERTIES specifier?"); return false; - } + } // now loop over all the targets int i; - for(i = 0; i < numFiles; ++i) - { + for (i = 0; i < numFiles; ++i) { std::string errors; - bool ret = - cmSetTestsPropertiesCommand::SetOneTest(args[i], - propertyPairs, - this->Makefile, errors); - if (!ret) - { + bool ret = cmSetTestsPropertiesCommand::SetOneTest(args[i], propertyPairs, + this->Makefile, errors); + if (!ret) { this->SetError(errors); return ret; - } } + } return true; } - -bool cmSetTestsPropertiesCommand -::SetOneTest(const std::string& tname, - std::vector<std::string> &propertyPairs, - cmMakefile *mf, std::string &errors) +bool cmSetTestsPropertiesCommand::SetOneTest( + const std::string& tname, std::vector<std::string>& propertyPairs, + cmMakefile* mf, std::string& errors) { - if(cmTest* test = mf->GetTest(tname)) - { + if (cmTest* test = mf->GetTest(tname)) { // now loop through all the props and set them unsigned int k; - for (k = 0; k < propertyPairs.size(); k = k + 2) - { - if (!propertyPairs[k].empty()) - { - test->SetProperty(propertyPairs[k], propertyPairs[k+1].c_str()); - } + for (k = 0; k < propertyPairs.size(); k = k + 2) { + if (!propertyPairs[k].empty()) { + test->SetProperty(propertyPairs[k], propertyPairs[k + 1].c_str()); } } - else - { + } else { errors = "Can not find test to add properties to: "; errors += tname; return false; - } + } return true; } - |