summaryrefslogtreecommitdiffstats
path: root/Source/cmRemoveCommand.cxx
diff options
context:
space:
mode:
authorKitware Robot <kwrobot@kitware.com>2016-05-16 14:34:04 (GMT)
committerBrad King <brad.king@kitware.com>2016-05-16 20:05:19 (GMT)
commitd9fd2f5402eeaa345691313658e02b51038f570b (patch)
treedca71b9a7e267f4c6300da3eb770415381726785 /Source/cmRemoveCommand.cxx
parent82df6deaafb36cbbfd450202bb20b320f637751a (diff)
downloadCMake-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/cmRemoveCommand.cxx')
-rw-r--r--Source/cmRemoveCommand.cxx39
1 files changed, 15 insertions, 24 deletions
diff --git a/Source/cmRemoveCommand.cxx b/Source/cmRemoveCommand.cxx
index bad38be..955f712 100644
--- a/Source/cmRemoveCommand.cxx
+++ b/Source/cmRemoveCommand.cxx
@@ -12,24 +12,21 @@
#include "cmRemoveCommand.h"
// cmRemoveCommand
-bool cmRemoveCommand
-::InitialPass(std::vector<std::string> const& args, cmExecutionStatus &)
+bool cmRemoveCommand::InitialPass(std::vector<std::string> const& args,
+ cmExecutionStatus&)
{
- if(args.size() < 1)
- {
+ if (args.size() < 1) {
return true;
- }
+ }
const char* variable = args[0].c_str(); // VAR is always first
// get the old value
- const char* cacheValue
- = this->Makefile->GetDefinition(variable);
+ const char* cacheValue = this->Makefile->GetDefinition(variable);
// if there is no old value then return
- if (!cacheValue)
- {
+ if (!cacheValue) {
return true;
- }
+ }
// expand the variable
std::vector<std::string> varArgsExpanded;
@@ -44,30 +41,24 @@ bool cmRemoveCommand
// now create the new value
std::string value;
- for(unsigned int j = 0; j < varArgsExpanded.size(); ++j)
- {
+ for (unsigned int j = 0; j < varArgsExpanded.size(); ++j) {
int found = 0;
- for(unsigned int k = 0; k < argsExpanded.size(); ++k)
- {
- if (varArgsExpanded[j] == argsExpanded[k])
- {
+ for (unsigned int k = 0; k < argsExpanded.size(); ++k) {
+ if (varArgsExpanded[j] == argsExpanded[k]) {
found = 1;
break;
- }
}
- if (!found)
- {
- if (!value.empty())
- {
+ }
+ if (!found) {
+ if (!value.empty()) {
value += ";";
- }
- value += varArgsExpanded[j];
}
+ value += varArgsExpanded[j];
}
+ }
// add the definition
this->Makefile->AddDefinition(variable, value.c_str());
return true;
}
-