diff options
| author | Brad King <brad.king@kitware.com> | 2015-01-19 14:43:28 (GMT) |
|---|---|---|
| committer | CMake Topic Stage <kwrobot@kitware.com> | 2015-01-19 14:43:28 (GMT) |
| commit | 9de2ab7fcefba2bc9ce7b483f1643b1d97d58e43 (patch) | |
| tree | bc1ed3ebea8f96f62ed2582c6358b34063f21299 /Source/cmWhileCommand.cxx | |
| parent | a6bbbd0f4a9ca9d683000f3302842bc25615e57a (diff) | |
| parent | 5f69314ea65ebd0de23484e7c91bd12a8bf861f6 (diff) | |
| download | CMake-9de2ab7fcefba2bc9ce7b483f1643b1d97d58e43.zip CMake-9de2ab7fcefba2bc9ce7b483f1643b1d97d58e43.tar.gz CMake-9de2ab7fcefba2bc9ce7b483f1643b1d97d58e43.tar.bz2 | |
Merge topic 'consistent-empty-method'
5f69314e Replace foo.length() pattern with !foo.empty().
fd0c036c Replace 'foo.length() >= 1' pattern with !foo.empty()
f09fde2d Replace 'foo.length() > 0' pattern with !foo.empty().
86b5bdfa Replace 'foo.length() == 0' pattern with foo.empty().
fd7b3712 Replace foo.size() pattern with !foo.empty().
aa773035 Replace !foo.size() pattern with foo.empty().
64592633 cmListCommand: Use empty() and expand whitespace.
607e1938 Replace 'foo.size() != 0' pattern with !foo.empty().
930bd478 Replace 'foo.size() == 0' pattern with foo.empty().
d92887ef Replace 'foo.size() > 0' pattern with !foo.empty().
Diffstat (limited to 'Source/cmWhileCommand.cxx')
| -rw-r--r-- | Source/cmWhileCommand.cxx | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/Source/cmWhileCommand.cxx b/Source/cmWhileCommand.cxx index 47edb03..5170ead 100644 --- a/Source/cmWhileCommand.cxx +++ b/Source/cmWhileCommand.cxx @@ -47,7 +47,7 @@ IsFunctionBlocked(const cmListFileFunction& lff, cmMakefile &mf, while (isTrue) { - if (errorString.size()) + if (!errorString.empty()) { std::string err = "had incorrect arguments: "; unsigned int i; @@ -120,7 +120,7 @@ ShouldRemove(const cmListFileFunction& lff, cmMakefile& ) { // if the endwhile has arguments, then make sure // they match the arguments of the matching while - if (lff.Arguments.size() == 0 || + if (lff.Arguments.empty() || lff.Arguments == this->Args) { return true; |