Merge topic 'size-empty'

73f648f1 use empty method to check for emptyness
2016-09-16 10:21:39 -04:00 · 2016-09-16 10:21:39 -04:00 · 60ebd0acf8
parent cf0e005202 73f648f167
commit 60ebd0acf8
44 changed files with 46 additions and 46 deletions
--- a/Source/cmAddCompileOptionsCommand.cxx
+++ b/Source/cmAddCompileOptionsCommand.cxx
@ -14,7 +14,7 @@
 bool cmAddCompileOptionsCommand::InitialPass(
  std::vector<std::string> const& args, cmExecutionStatus&)
 {
-  if (args.size() < 1) {
+  if (args.empty()) {
    return true;
  }

--- a/Source/cmAddCustomTargetCommand.cxx
+++ b/Source/cmAddCustomTargetCommand.cxx
@ -18,7 +18,7 @@
 bool cmAddCustomTargetCommand::InitialPass(
  std::vector<std::string> const& args, cmExecutionStatus&)
 {
-  if (args.size() < 1) {
+  if (args.empty()) {
    this->SetError("called with incorrect number of arguments");
    return false;
  }
--- a/Source/cmAddDefinitionsCommand.cxx
+++ b/Source/cmAddDefinitionsCommand.cxx
@ -16,7 +16,7 @@ bool cmAddDefinitionsCommand::InitialPass(std::vector<std::string> const& args,
                                          cmExecutionStatus&)
 {
  // it is OK to have no arguments
-  if (args.size() < 1) {
+  if (args.empty()) {
    return true;
  }

--- a/Source/cmAddLibraryCommand.cxx
+++ b/Source/cmAddLibraryCommand.cxx
@ -18,7 +18,7 @@
 bool cmAddLibraryCommand::InitialPass(std::vector<std::string> const& args,
                                      cmExecutionStatus&)
 {
-  if (args.size() < 1) {
+  if (args.empty()) {
    this->SetError("called with incorrect number of arguments");
    return false;
  }
--- a/Source/cmAddSubDirectoryCommand.cxx
+++ b/Source/cmAddSubDirectoryCommand.cxx
@ -15,7 +15,7 @@
 bool cmAddSubDirectoryCommand::InitialPass(
  std::vector<std::string> const& args, cmExecutionStatus&)
 {
-  if (args.size() < 1) {
+  if (args.empty()) {
    this->SetError("called with incorrect number of arguments");
    return false;
  }
--- a/Source/cmBuildCommand.cxx
+++ b/Source/cmBuildCommand.cxx
@ -27,7 +27,7 @@ bool cmBuildCommand::InitialPass(std::vector<std::string> const& args,

 bool cmBuildCommand::MainSignature(std::vector<std::string> const& args)
 {
-  if (args.size() < 1) {
+  if (args.empty()) {
    this->SetError("requires at least one argument naming a CMake variable");
    return false;
  }
--- a/Source/cmBuildNameCommand.cxx
+++ b/Source/cmBuildNameCommand.cxx
@ -22,7 +22,7 @@ bool cmBuildNameCommand::InitialPass(std::vector<std::string> const& args,
        "The build_name command should not be called; see CMP0036.")) {
    return true;
  }
-  if (args.size() < 1) {
+  if (args.empty()) {
    this->SetError("called with incorrect number of arguments");
    return false;
  }
--- a/Source/cmCMakePolicyCommand.cxx
+++ b/Source/cmCMakePolicyCommand.cxx
@ -17,7 +17,7 @@
 bool cmCMakePolicyCommand::InitialPass(std::vector<std::string> const& args,
                                       cmExecutionStatus&)
 {
-  if (args.size() < 1) {
+  if (args.empty()) {
    this->SetError("requires at least one argument.");
    return false;
  }
--- a/Source/cmConditionEvaluator.cxx
+++ b/Source/cmConditionEvaluator.cxx
@ -85,7 +85,7 @@ bool cmConditionEvaluator::IsTrue(
  errorString = "";

  // handle empty invocation
-  if (args.size() < 1) {
+  if (args.empty()) {
    return false;
  }

--- a/Source/cmDefinePropertyCommand.cxx
+++ b/Source/cmDefinePropertyCommand.cxx
@ -17,7 +17,7 @@
 bool cmDefinePropertyCommand::InitialPass(std::vector<std::string> const& args,
                                          cmExecutionStatus&)
 {
-  if (args.size() < 1) {
+  if (args.empty()) {
    this->SetError("called with incorrect number of arguments");
    return false;
  }
--- a/Source/cmEnableLanguageCommand.cxx
+++ b/Source/cmEnableLanguageCommand.cxx
@ -17,7 +17,7 @@ bool cmEnableLanguageCommand::InitialPass(std::vector<std::string> const& args,
 {
  bool optional = false;
  std::vector<std::string> languages;
-  if (args.size() < 1) {
+  if (args.empty()) {
    this->SetError("called with incorrect number of arguments");
    return false;
  }
--- a/Source/cmExecProgramCommand.cxx
+++ b/Source/cmExecProgramCommand.cxx
@ -19,7 +19,7 @@
 bool cmExecProgramCommand::InitialPass(std::vector<std::string> const& args,
                                       cmExecutionStatus&)
 {
-  if (args.size() < 1) {
+  if (args.empty()) {
    this->SetError("called with incorrect number of arguments");
    return false;
  }
--- a/Source/cmExecuteProcessCommand.cxx
+++ b/Source/cmExecuteProcessCommand.cxx
@ -31,7 +31,7 @@ void cmExecuteProcessCommandAppend(std::vector<char>& output, const char* data,
 bool cmExecuteProcessCommand::InitialPass(std::vector<std::string> const& args,
                                          cmExecutionStatus&)
 {
-  if (args.size() < 1) {
+  if (args.empty()) {
    this->SetError("called with incorrect number of arguments");
    return false;
  }
--- a/Source/cmExportBuildAndroidMKGenerator.cxx
+++ b/Source/cmExportBuildAndroidMKGenerator.cxx
@ -69,7 +69,7 @@ void cmExportBuildAndroidMKGenerator::GenerateInterfaceProperties(
  const ImportPropertyMap& properties)
 {
  std::string config = "";
-  if (this->Configurations.size()) {
+  if (!this->Configurations.empty()) {
    config = this->Configurations[0];
  }
  cmExportBuildAndroidMKGenerator::GenerateInterfaceProperties(
--- a/Source/cmExportInstallAndroidMKGenerator.cxx
+++ b/Source/cmExportInstallAndroidMKGenerator.cxx
@ -76,7 +76,7 @@ void cmExportInstallAndroidMKGenerator::GenerateImportTargetCode(
  os << "LOCAL_SRC_FILES := $(_IMPORT_PREFIX)/";
  os << target->Target->GetProperty("__dest") << "/";
  std::string config = "";
-  if (this->Configurations.size()) {
+  if (!this->Configurations.empty()) {
    config = this->Configurations[0];
  }
  os << target->GetFullName(config) << "\n";
@ -103,7 +103,7 @@ void cmExportInstallAndroidMKGenerator::GenerateInterfaceProperties(
  const ImportPropertyMap& properties)
 {
  std::string config = "";
-  if (this->Configurations.size()) {
+  if (!this->Configurations.empty()) {
    config = this->Configurations[0];
  }
  cmExportBuildAndroidMKGenerator::GenerateInterfaceProperties(
--- a/Source/cmExportLibraryDependenciesCommand.cxx
+++ b/Source/cmExportLibraryDependenciesCommand.cxx
@ -27,7 +27,7 @@ bool cmExportLibraryDependenciesCommand::InitialPass(
        "see CMP0033.")) {
    return true;
  }
-  if (args.size() < 1) {
+  if (args.empty()) {
    this->SetError("called with incorrect number of arguments");
    return false;
  }
--- a/Source/cmFindPackageCommand.cxx
+++ b/Source/cmFindPackageCommand.cxx
@ -130,7 +130,7 @@ void cmFindPackageCommand::AppendSearchPathGroups()
 bool cmFindPackageCommand::InitialPass(std::vector<std::string> const& args,
                                       cmExecutionStatus&)
 {
-  if (args.size() < 1) {
+  if (args.empty()) {
    this->SetError("called with incorrect number of arguments");
    return false;
  }
--- a/Source/cmForEachCommand.cxx
+++ b/Source/cmForEachCommand.cxx
@ -113,7 +113,7 @@ bool cmForEachFunctionBlocker::ShouldRemove(const cmListFileFunction& lff,
 bool cmForEachCommand::InitialPass(std::vector<std::string> const& args,
                                   cmExecutionStatus&)
 {
-  if (args.size() < 1) {
+  if (args.empty()) {
    this->SetError("called with incorrect number of arguments");
    return false;
  }
--- a/Source/cmFunctionCommand.cxx
+++ b/Source/cmFunctionCommand.cxx
@ -202,7 +202,7 @@ bool cmFunctionFunctionBlocker::ShouldRemove(const cmListFileFunction& lff,
 bool cmFunctionCommand::InitialPass(std::vector<std::string> const& args,
                                    cmExecutionStatus&)
 {
-  if (args.size() < 1) {
+  if (args.empty()) {
    this->SetError("called with incorrect number of arguments");
    return false;
  }
--- a/Source/cmIncludeCommand.cxx
+++ b/Source/cmIncludeCommand.cxx
@ -15,7 +15,7 @@
 bool cmIncludeCommand::InitialPass(std::vector<std::string> const& args,
                                   cmExecutionStatus&)
 {
-  if (args.size() < 1 || args.size() > 4) {
+  if (args.empty() || args.size() > 4) {
    this->SetError("called with wrong number of arguments.  "
                   "include() only takes one file.");
    return false;
--- a/Source/cmIncludeDirectoryCommand.cxx
+++ b/Source/cmIncludeDirectoryCommand.cxx
@ -15,7 +15,7 @@
 bool cmIncludeDirectoryCommand::InitialPass(
  std::vector<std::string> const& args, cmExecutionStatus&)
 {
-  if (args.size() < 1) {
+  if (args.empty()) {
    return true;
  }

--- a/Source/cmIncludeRegularExpressionCommand.cxx
+++ b/Source/cmIncludeRegularExpressionCommand.cxx
@ -15,7 +15,7 @@
 bool cmIncludeRegularExpressionCommand::InitialPass(
  std::vector<std::string> const& args, cmExecutionStatus&)
 {
-  if ((args.size() < 1) || (args.size() > 2)) {
+  if ((args.empty()) || (args.size() > 2)) {
    this->SetError("called with incorrect number of arguments");
    return false;
  }
--- a/Source/cmLinkDirectoriesCommand.cxx
+++ b/Source/cmLinkDirectoriesCommand.cxx
@ -15,7 +15,7 @@
 bool cmLinkDirectoriesCommand::InitialPass(
  std::vector<std::string> const& args, cmExecutionStatus&)
 {
-  if (args.size() < 1) {
+  if (args.empty()) {
    return true;
  }

--- a/Source/cmLinkLibrariesCommand.cxx
+++ b/Source/cmLinkLibrariesCommand.cxx
@ -15,7 +15,7 @@
 bool cmLinkLibrariesCommand::InitialPass(std::vector<std::string> const& args,
                                         cmExecutionStatus&)
 {
-  if (args.size() < 1) {
+  if (args.empty()) {
    return true;
  }
  // add libraries, nothe that there is an optional prefix
--- a/Source/cmLinkedTree.h
+++ b/Source/cmLinkedTree.h
@ -167,10 +167,10 @@ public:

  iterator Truncate()
  {
-    assert(this->UpPositions.size() > 0);
+    assert(!this->UpPositions.empty());
    this->UpPositions.erase(this->UpPositions.begin() + 1,
                            this->UpPositions.end());
-    assert(this->Data.size() > 0);
+    assert(!this->Data.empty());
    this->Data.erase(this->Data.begin() + 1, this->Data.end());
    return iterator(this, 1);
  }
--- a/Source/cmLoadCacheCommand.cxx
+++ b/Source/cmLoadCacheCommand.cxx
@ -18,7 +18,7 @@
 bool cmLoadCacheCommand::InitialPass(std::vector<std::string> const& args,
                                     cmExecutionStatus&)
 {
-  if (args.size() < 1) {
+  if (args.empty()) {
    this->SetError("called with wrong number of arguments.");
  }

--- a/Source/cmLoadCommandCommand.cxx
+++ b/Source/cmLoadCommandCommand.cxx
@ -183,7 +183,7 @@ bool cmLoadCommandCommand::InitialPass(std::vector<std::string> const& args,
        "The load_command command should not be called; see CMP0031.")) {
    return true;
  }
-  if (args.size() < 1) {
+  if (args.empty()) {
    return true;
  }

--- a/Source/cmMacroCommand.cxx
+++ b/Source/cmMacroCommand.cxx
@ -236,7 +236,7 @@ bool cmMacroFunctionBlocker::ShouldRemove(const cmListFileFunction& lff,
 bool cmMacroCommand::InitialPass(std::vector<std::string> const& args,
                                 cmExecutionStatus&)
 {
-  if (args.size() < 1) {
+  if (args.empty()) {
    this->SetError("called with incorrect number of arguments");
    return false;
  }
--- a/Source/cmMarkAsAdvancedCommand.cxx
+++ b/Source/cmMarkAsAdvancedCommand.cxx
@ -15,7 +15,7 @@
 bool cmMarkAsAdvancedCommand::InitialPass(std::vector<std::string> const& args,
                                          cmExecutionStatus&)
 {
-  if (args.size() < 1) {
+  if (args.empty()) {
    this->SetError("called with incorrect number of arguments");
    return false;
  }
--- a/Source/cmMathCommand.cxx
+++ b/Source/cmMathCommand.cxx
@ -16,7 +16,7 @@
 bool cmMathCommand::InitialPass(std::vector<std::string> const& args,
                                cmExecutionStatus&)
 {
-  if (args.size() < 1) {
+  if (args.empty()) {
    this->SetError("must be called with at least one argument.");
    return false;
  }
--- a/Source/cmMessageCommand.cxx
+++ b/Source/cmMessageCommand.cxx
@ -17,7 +17,7 @@
 bool cmMessageCommand::InitialPass(std::vector<std::string> const& args,
                                   cmExecutionStatus&)
 {
-  if (args.size() < 1) {
+  if (args.empty()) {
    this->SetError("called with incorrect number of arguments");
    return false;
  }
--- a/Source/cmProjectCommand.cxx
+++ b/Source/cmProjectCommand.cxx
@ -15,7 +15,7 @@
 bool cmProjectCommand::InitialPass(std::vector<std::string> const& args,
                                   cmExecutionStatus&)
 {
-  if (args.size() < 1) {
+  if (args.empty()) {
    this->SetError("PROJECT called with incorrect number of arguments");
    return false;
  }
--- a/Source/cmRemoveCommand.cxx
+++ b/Source/cmRemoveCommand.cxx
@ -15,7 +15,7 @@
 bool cmRemoveCommand::InitialPass(std::vector<std::string> const& args,
                                  cmExecutionStatus&)
 {
-  if (args.size() < 1) {
+  if (args.empty()) {
    return true;
  }

--- a/Source/cmRemoveDefinitionsCommand.cxx
+++ b/Source/cmRemoveDefinitionsCommand.cxx
@ -16,7 +16,7 @@ bool cmRemoveDefinitionsCommand::InitialPass(
  std::vector<std::string> const& args, cmExecutionStatus&)
 {
  // it is OK to have no arguments
-  if (args.size() < 1) {
+  if (args.empty()) {
    return true;
  }

--- a/Source/cmSetCommand.cxx
+++ b/Source/cmSetCommand.cxx
@ -15,7 +15,7 @@
 bool cmSetCommand::InitialPass(std::vector<std::string> const& args,
                               cmExecutionStatus&)
 {
-  if (args.size() < 1) {
+  if (args.empty()) {
    this->SetError("called with incorrect number of arguments");
    return false;
  }
--- a/Source/cmSetDirectoryPropertiesCommand.cxx
+++ b/Source/cmSetDirectoryPropertiesCommand.cxx
@ -17,7 +17,7 @@
 bool cmSetDirectoryPropertiesCommand::InitialPass(
  std::vector<std::string> const& args, cmExecutionStatus&)
 {
-  if (args.size() < 1) {
+  if (args.empty()) {
    this->SetError("called with incorrect number of arguments");
    return false;
  }
--- a/Source/cmSetTestsPropertiesCommand.cxx
+++ b/Source/cmSetTestsPropertiesCommand.cxx
@ -18,7 +18,7 @@
 bool cmSetTestsPropertiesCommand::InitialPass(
  std::vector<std::string> const& args, cmExecutionStatus&)
 {
-  if (args.size() < 1) {
+  if (args.empty()) {
    this->SetError("called with incorrect number of arguments");
    return false;
  }
--- a/Source/cmSourceGroupCommand.cxx
+++ b/Source/cmSourceGroupCommand.cxx
@ -15,7 +15,7 @@
 bool cmSourceGroupCommand::InitialPass(std::vector<std::string> const& args,
                                       cmExecutionStatus&)
 {
-  if (args.size() < 1) {
+  if (args.empty()) {
    this->SetError("called with incorrect number of arguments");
    return false;
  }
--- a/Source/cmStringCommand.cxx
+++ b/Source/cmStringCommand.cxx
@ -26,7 +26,7 @@
 bool cmStringCommand::InitialPass(std::vector<std::string> const& args,
                                  cmExecutionStatus&)
 {
-  if (args.size() < 1) {
+  if (args.empty()) {
    this->SetError("must be called with at least one argument.");
    return false;
  }
--- a/Source/cmSubdirCommand.cxx
+++ b/Source/cmSubdirCommand.cxx
@ -15,7 +15,7 @@
 bool cmSubdirCommand::InitialPass(std::vector<std::string> const& args,
                                  cmExecutionStatus&)
 {
-  if (args.size() < 1) {
+  if (args.empty()) {
    this->SetError("called with incorrect number of arguments");
    return false;
  }
--- a/Source/cmTargetLinkLibrariesCommand.cxx
+++ b/Source/cmTargetLinkLibrariesCommand.cxx
@ -22,7 +22,7 @@ bool cmTargetLinkLibrariesCommand::InitialPass(
  std::vector<std::string> const& args, cmExecutionStatus&)
 {
  // must have one argument
-  if (args.size() < 1) {
+  if (args.empty()) {
    this->SetError("called with incorrect number of arguments");
    return false;
  }
--- a/Source/cmUnsetCommand.cxx
+++ b/Source/cmUnsetCommand.cxx
@ -15,7 +15,7 @@
 bool cmUnsetCommand::InitialPass(std::vector<std::string> const& args,
                                 cmExecutionStatus&)
 {
-  if (args.size() < 1 || args.size() > 2) {
+  if (args.empty() || args.size() > 2) {
    this->SetError("called with incorrect number of arguments");
    return false;
  }
--- a/Source/cmVariableWatchCommand.cxx
+++ b/Source/cmVariableWatchCommand.cxx
@ -104,7 +104,7 @@ cmVariableWatchCommand::~cmVariableWatchCommand()
 bool cmVariableWatchCommand::InitialPass(std::vector<std::string> const& args,
                                         cmExecutionStatus&)
 {
-  if (args.size() < 1) {
+  if (args.empty()) {
    this->SetError("must be called with at least one argument.");
    return false;
  }
--- a/Source/cmWhileCommand.cxx
+++ b/Source/cmWhileCommand.cxx
@ -133,7 +133,7 @@ bool cmWhileFunctionBlocker::ShouldRemove(const cmListFileFunction& lff,
 bool cmWhileCommand::InvokeInitialPass(
  const std::vector<cmListFileArgument>& args, cmExecutionStatus&)
 {
-  if (args.size() < 1) {
+  if (args.empty()) {
    this->SetError("called with incorrect number of arguments");
    return false;
  }