[Cmake-commits] CMake branch, next, updated. v3.3.1-2419-g9908727

Stephen Kelly steveire at gmail.com
Mon Aug 24 14:48:49 EDT 2015


This is an automated email from the git hooks/post-receive script. It was
generated because a ref change was pushed to the repository containing
the project "CMake".

The branch, next has been updated
       via  9908727dfa4a0bfeb38aaf5e1111e5127361aee8 (commit)
       via  e876963fc9e03018a189f4433050d459a475afbf (commit)
       via  44ffb9cdb4329c5ed9b724659f234d26da336b5a (commit)
       via  8f89f8b1e9693abbc50d917c04846000bf14e189 (commit)
       via  524610f967e5289810a0d67a2942493d8f61d1dd (commit)
       via  0e14c7ee6375fcaa975194557523f5a1a8686a8a (commit)
      from  6c485ea8009341d0c746ed3bac3c5d31e6bcea7f (commit)

Those revisions listed above that are new to this repository have
not appeared on any other notification email; so we list those
revisions in full, below.

- Log -----------------------------------------------------------------
http://cmake.org/gitweb?p=cmake.git;a=commitdiff;h=9908727dfa4a0bfeb38aaf5e1111e5127361aee8
commit 9908727dfa4a0bfeb38aaf5e1111e5127361aee8
Merge: 6c485ea e876963
Author:     Stephen Kelly <steveire at gmail.com>
AuthorDate: Mon Aug 24 14:48:48 2015 -0400
Commit:     CMake Topic Stage <kwrobot at kitware.com>
CommitDate: Mon Aug 24 14:48:48 2015 -0400

    Merge topic 'consistent-empty' into next
    
    e876963f Replace '0 == instances.size()' with instances.empty().
    44ffb9cd Replace foo.size() pattern with !foo.empty().
    8f89f8b1 Replace 'foo.size() != 0' pattern with !foo.empty().
    524610f9 Replace 'foo.size() == 0' pattern with foo.empty().
    0e14c7ee Replace 'foo.size() > 0' pattern with !foo.empty().


http://cmake.org/gitweb?p=cmake.git;a=commitdiff;h=e876963fc9e03018a189f4433050d459a475afbf
commit e876963fc9e03018a189f4433050d459a475afbf
Author:     Stephen Kelly <steveire at gmail.com>
AuthorDate: Thu Jan 15 23:45:51 2015 +0100
Commit:     Stephen Kelly <steveire at gmail.com>
CommitDate: Mon Aug 24 20:47:18 2015 +0200

    Replace '0 == instances.size()' with instances.empty().
    
    This is not a pattern.

diff --git a/Source/cmCallVisualStudioMacro.cxx b/Source/cmCallVisualStudioMacro.cxx
index c211111..0e04838 100644
--- a/Source/cmCallVisualStudioMacro.cxx
+++ b/Source/cmCallVisualStudioMacro.cxx
@@ -498,7 +498,7 @@ int cmCallVisualStudioMacro::CallMacro(
           }
         }
 
-      if(0 == instances.size())
+      if(instances.empty())
         {
         // no instances to call
 

http://cmake.org/gitweb?p=cmake.git;a=commitdiff;h=44ffb9cdb4329c5ed9b724659f234d26da336b5a
commit 44ffb9cdb4329c5ed9b724659f234d26da336b5a
Author:     Stephen Kelly <steveire at gmail.com>
AuthorDate: Fri Jan 16 01:17:32 2015 +0100
Commit:     Stephen Kelly <steveire at gmail.com>
CommitDate: Mon Aug 24 20:47:18 2015 +0200

    Replace foo.size() pattern with !foo.empty().

diff --git a/Source/CPack/WiX/cmCPackWIXGenerator.cxx b/Source/CPack/WiX/cmCPackWIXGenerator.cxx
index b3eb7b2..6f25e50 100644
--- a/Source/CPack/WiX/cmCPackWIXGenerator.cxx
+++ b/Source/CPack/WiX/cmCPackWIXGenerator.cxx
@@ -217,7 +217,7 @@ bool cmCPackWIXGenerator::InitializeWiXConfiguration()
     {
     std::string defaultRef = "WixUI_InstallDir";
 
-    if(this->Components.size())
+    if(!this->Components.empty())
       {
       defaultRef = "WixUI_FeatureTree";
       }
@@ -1005,7 +1005,7 @@ void cmCPackWIXGenerator::AddDirectoryAndFileDefinitons(
           shortcut.workingDirectoryId = directoryId;
           shortcuts.insert(cmWIXShortcuts::START_MENU, id, shortcut);
 
-          if(desktopExecutables.size() &&
+          if(!desktopExecutables.empty() &&
              std::find(desktopExecutables.begin(),
                        desktopExecutables.end(),
                        executableName)
diff --git a/Source/CPack/WiX/cmWIXAccessControlList.cxx b/Source/CPack/WiX/cmWIXAccessControlList.cxx
index aeec968..fc0d3d3 100644
--- a/Source/CPack/WiX/cmWIXAccessControlList.cxx
+++ b/Source/CPack/WiX/cmWIXAccessControlList.cxx
@@ -71,7 +71,7 @@ void cmWIXAccessControlList::CreatePermissionElement(
 
   this->SourceWriter.BeginElement("Permission");
   this->SourceWriter.AddAttribute("User", user);
-  if(domain.size())
+  if(!domain.empty())
     {
     this->SourceWriter.AddAttribute("Domain", domain);
     }
diff --git a/Source/CPack/WiX/cmWIXPatch.cxx b/Source/CPack/WiX/cmWIXPatch.cxx
index b5202e0..5a8dc63 100644
--- a/Source/CPack/WiX/cmWIXPatch.cxx
+++ b/Source/CPack/WiX/cmWIXPatch.cxx
@@ -79,7 +79,7 @@ bool cmWIXPatch::CheckForUnappliedFragments()
     fragmentList += "'";
     }
 
-  if(fragmentList.size())
+  if(!fragmentList.empty())
     {
       cmCPackLogger(cmCPackLog::LOG_ERROR,
         "Some XML patch fragments did not have matching IDs: " <<
diff --git a/Source/CPack/WiX/cmWIXSourceWriter.cxx b/Source/CPack/WiX/cmWIXSourceWriter.cxx
index 219fca8..8d38e9b 100644
--- a/Source/CPack/WiX/cmWIXSourceWriter.cxx
+++ b/Source/CPack/WiX/cmWIXSourceWriter.cxx
@@ -128,7 +128,7 @@ void cmWIXSourceWriter::AddAttribute(
 void cmWIXSourceWriter::AddAttributeUnlessEmpty(
     std::string const& key, std::string const& value)
 {
-  if(value.size())
+  if(!value.empty())
     {
     AddAttribute(key, value);
     }
diff --git a/Source/CPack/cmCPackNSISGenerator.cxx b/Source/CPack/cmCPackNSISGenerator.cxx
index 49aad97..6cdda28 100644
--- a/Source/CPack/cmCPackNSISGenerator.cxx
+++ b/Source/CPack/cmCPackNSISGenerator.cxx
@@ -536,7 +536,7 @@ int cmCPackNSISGenerator::InitializeInternal()
         << ".lnk\"" << std::endl;
       // see if CPACK_CREATE_DESKTOP_LINK_ExeName is on
       // if so add a desktop link
-      if(cpackPackageDesktopLinksVector.size() &&
+      if(!cpackPackageDesktopLinksVector.empty() &&
          std::find(cpackPackageDesktopLinksVector.begin(),
                    cpackPackageDesktopLinksVector.end(),
                    execName)
diff --git a/Source/cmGlobalMSYSMakefileGenerator.cxx b/Source/cmGlobalMSYSMakefileGenerator.cxx
index a84923b..9a6f3ba 100644
--- a/Source/cmGlobalMSYSMakefileGenerator.cxx
+++ b/Source/cmGlobalMSYSMakefileGenerator.cxx
@@ -62,19 +62,19 @@ void cmGlobalMSYSMakefileGenerator
   locations.push_back("c:/mingw/bin");
   std::string tgcc = cmSystemTools::FindProgram("gcc", locations);
   std::string gcc = "gcc.exe";
-  if(tgcc.size())
+  if(!tgcc.empty())
     {
     gcc = tgcc;
     }
   std::string tgxx = cmSystemTools::FindProgram("g++", locations);
   std::string gxx = "g++.exe";
-  if(tgxx.size())
+  if(!tgxx.empty())
     {
     gxx = tgxx;
     }
   std::string trc = cmSystemTools::FindProgram("windres", locations);
   std::string rc = "windres.exe";
-  if(trc.size())
+  if(!trc.empty())
     {
     rc = trc;
     }
diff --git a/Source/cmGlobalVisualStudioGenerator.cxx b/Source/cmGlobalVisualStudioGenerator.cxx
index 553d568..b0aa243 100644
--- a/Source/cmGlobalVisualStudioGenerator.cxx
+++ b/Source/cmGlobalVisualStudioGenerator.cxx
@@ -81,7 +81,7 @@ bool cmGlobalVisualStudioGenerator::Compute()
     {
     std::vector<cmLocalGenerator*>& gen = it->second;
     // add the ALL_BUILD to the first local generator of each project
-    if(gen.size())
+    if(!gen.empty())
       {
       // Use no actual command lines so that the target itself is not
       // considered always out of date.
diff --git a/Source/cmGlobalXCodeGenerator.cxx b/Source/cmGlobalXCodeGenerator.cxx
index 39933cb..4ba29f5 100644
--- a/Source/cmGlobalXCodeGenerator.cxx
+++ b/Source/cmGlobalXCodeGenerator.cxx
@@ -772,7 +772,7 @@ cmGlobalXCodeGenerator::CreateXCodeSourceFile(cmLocalGenerator* lg,
                       sf->GetProperty("COMPILE_DEFINITIONS"), true);
   if (!flagsBuild.IsEmpty())
     {
-    if (flags.size())
+    if (!flags.empty())
       {
       flags += ' ';
       }
@@ -1874,7 +1874,7 @@ void cmGlobalXCodeGenerator::CreateBuildSettings(cmTarget& target,
     {
     extraLinkOptionsVar = "CMAKE_MODULE_LINKER_FLAGS";
     }
-  if(extraLinkOptionsVar.size())
+  if(!extraLinkOptionsVar.empty())
     {
     this->CurrentLocalGenerator
       ->AddConfigVariableFlags(extraLinkOptions,
@@ -2614,7 +2614,7 @@ std::string cmGlobalXCodeGenerator::AddConfigurations(cmXCodeObject* target,
     config->SetComment(configVector[i].c_str());
     config->AddAttribute("buildSettings", buildSettings);
     }
-  if(configVector.size())
+  if(!configVector.empty())
     {
     configlist->AddAttribute("defaultConfigurationName",
                              this->CreateString(configVector[0].c_str()));
diff --git a/Source/cmLocalVisualStudio10Generator.cxx b/Source/cmLocalVisualStudio10Generator.cxx
index 9ded83a..9e3185c 100644
--- a/Source/cmLocalVisualStudio10Generator.cxx
+++ b/Source/cmLocalVisualStudio10Generator.cxx
@@ -33,7 +33,7 @@ class cmVS10XMLParser : public cmXMLParser
   virtual void StartElement(const std::string& name, const char**)
     {
       // once the GUID is found do nothing
-      if(this->GUID.size())
+      if(!this->GUID.empty())
         {
         return;
         }
diff --git a/Source/cmLocalVisualStudio6Generator.cxx b/Source/cmLocalVisualStudio6Generator.cxx
index 5b78f0d..0d07536 100644
--- a/Source/cmLocalVisualStudio6Generator.cxx
+++ b/Source/cmLocalVisualStudio6Generator.cxx
@@ -984,7 +984,7 @@ void cmLocalVisualStudio6Generator
   std::string libMultiLineDebugOptions;
   std::string libMultiLineOptimizedOptions;
 
-  if(libPath.size())
+  if(!libPath.empty())
     {
     std::string lpath =
       this->ConvertToOutputFormat(libPath.c_str(), SHELL);
@@ -1017,7 +1017,7 @@ void cmLocalVisualStudio6Generator
       libMultiLineOptionsForDebug += " \n";
       }
     }
-  if(exePath.size())
+  if(!exePath.empty())
     {
     std::string lpath =
       this->ConvertToOutputFormat(exePath.c_str(), SHELL);
@@ -1452,7 +1452,7 @@ void cmLocalVisualStudio6Generator
 
 #ifdef CM_USE_OLD_VS6
   // Compute link information for the target.
-  if(extraLinkOptions.size())
+  if(!extraLinkOptions.empty())
     {
     libOptions += " ";
     libOptions += extraLinkOptions;
@@ -1543,7 +1543,7 @@ void cmLocalVisualStudio6Generator
 
   std::string line;
   std::string libnameExports;
-  if(exportSymbol.size())
+  if(!exportSymbol.empty())
     {
     libnameExports = "/D \"";
     libnameExports += exportSymbol;
diff --git a/Source/cmLocalVisualStudio7Generator.cxx b/Source/cmLocalVisualStudio7Generator.cxx
index 2445995..5de6d37 100644
--- a/Source/cmLocalVisualStudio7Generator.cxx
+++ b/Source/cmLocalVisualStudio7Generator.cxx
@@ -2283,7 +2283,7 @@ public:
   virtual void StartElement(const std::string& name, const char** atts)
     {
       // once the GUID is found do nothing
-      if(this->GUID.size())
+      if(!this->GUID.empty())
         {
         return;
         }
diff --git a/Source/cmVisualStudio10TargetGenerator.cxx b/Source/cmVisualStudio10TargetGenerator.cxx
index 6344979..823b550 100644
--- a/Source/cmVisualStudio10TargetGenerator.cxx
+++ b/Source/cmVisualStudio10TargetGenerator.cxx
@@ -1656,7 +1656,7 @@ bool cmVisualStudio10TargetGenerator::OutputSourceSpecificFlags(
   // for the first time we need a new line if there is something
   // produced here.
   const char* firstString = ">\n";
-  if(objectName.size())
+  if(!objectName.empty())
     {
     (*this->BuildFileStream ) << firstString;
     firstString = "";
@@ -1675,7 +1675,7 @@ bool cmVisualStudio10TargetGenerator::OutputSourceSpecificFlags(
     defPropName += configUpper;
     if(const char* ccdefs = sf.GetProperty(defPropName.c_str()))
       {
-      if(configDefines.size())
+      if(!configDefines.empty())
         {
         configDefines += ";";
         }
diff --git a/Source/cmVisualStudioGeneratorOptions.cxx b/Source/cmVisualStudioGeneratorOptions.cxx
index abd350e..bd4eb69 100644
--- a/Source/cmVisualStudioGeneratorOptions.cxx
+++ b/Source/cmVisualStudioGeneratorOptions.cxx
@@ -274,7 +274,7 @@ cmVisualStudioGeneratorOptions
     {
     // if there are configuration specific flags, then
     // use the configuration specific tag for PreprocessorDefinitions
-    if(this->Configuration.size())
+    if(!this->Configuration.empty())
       {
       fout << prefix;
       this->TargetGenerator->WritePlatformConfigTag(
@@ -346,7 +346,7 @@ cmVisualStudioGeneratorOptions
         m != this->FlagMap.end(); ++m)
       {
       fout << indent;
-      if(this->Configuration.size())
+      if(!this->Configuration.empty())
         {
         this->TargetGenerator->WritePlatformConfigTag(
           m->first.c_str(),
@@ -398,7 +398,7 @@ cmVisualStudioGeneratorOptions
     if(this->Version >= cmGlobalVisualStudioGenerator::VS10)
       {
       fout << prefix;
-      if(this->Configuration.size())
+      if(!this->Configuration.empty())
         {
         this->TargetGenerator->WritePlatformConfigTag(
           "AdditionalOptions",

http://cmake.org/gitweb?p=cmake.git;a=commitdiff;h=8f89f8b1e9693abbc50d917c04846000bf14e189
commit 8f89f8b1e9693abbc50d917c04846000bf14e189
Author:     Stephen Kelly <steveire at gmail.com>
AuthorDate: Fri Jan 16 01:13:57 2015 +0100
Commit:     Stephen Kelly <steveire at gmail.com>
CommitDate: Mon Aug 24 20:47:17 2015 +0200

    Replace 'foo.size() != 0' pattern with !foo.empty().

diff --git a/Source/cmVisualStudio10TargetGenerator.cxx b/Source/cmVisualStudio10TargetGenerator.cxx
index a6568f1..6344979 100644
--- a/Source/cmVisualStudio10TargetGenerator.cxx
+++ b/Source/cmVisualStudio10TargetGenerator.cxx
@@ -2422,7 +2422,7 @@ cmVisualStudio10TargetGenerator::ComputeLinkOptions(std::string const& config)
     libs = this->Makefile->GetSafeDefinition(standardLibsVar.c_str());
   // Remove trailing spaces from libs
   std::string::size_type pos = libs.size()-1;
-  if(libs.size() != 0)
+  if(!libs.empty())
     {
     while(libs[pos] == ' ')
       {

http://cmake.org/gitweb?p=cmake.git;a=commitdiff;h=524610f967e5289810a0d67a2942493d8f61d1dd
commit 524610f967e5289810a0d67a2942493d8f61d1dd
Author:     Stephen Kelly <steveire at gmail.com>
AuthorDate: Fri Jan 16 01:12:53 2015 +0100
Commit:     Stephen Kelly <steveire at gmail.com>
CommitDate: Mon Aug 24 20:47:17 2015 +0200

    Replace 'foo.size() == 0' pattern with foo.empty().

diff --git a/Source/CPack/cmCPackNSISGenerator.cxx b/Source/CPack/cmCPackNSISGenerator.cxx
index 2de2bc4..49aad97 100644
--- a/Source/CPack/cmCPackNSISGenerator.cxx
+++ b/Source/CPack/cmCPackNSISGenerator.cxx
@@ -49,7 +49,7 @@ int cmCPackNSISGenerator::PackageFiles()
   // TODO: Fix nsis to force out file name
 
   std::string nsisInFileName = this->FindTemplate("NSIS.template.in");
-  if ( nsisInFileName.size() == 0 )
+  if (nsisInFileName.empty())
     {
     cmCPackLogger(cmCPackLog::LOG_ERROR,
       "CPack error: Could not find NSIS installer template file."
@@ -58,7 +58,7 @@ int cmCPackNSISGenerator::PackageFiles()
     }
   std::string nsisInInstallOptions
     = this->FindTemplate("NSIS.InstallOptions.ini.in");
-  if ( nsisInInstallOptions.size() == 0 )
+  if (nsisInInstallOptions.empty())
     {
     cmCPackLogger(cmCPackLog::LOG_ERROR,
       "CPack error: Could not find NSIS installer options file."
diff --git a/Source/cmGlobalVisualStudio6Generator.cxx b/Source/cmGlobalVisualStudio6Generator.cxx
index 65a15ee..b7c897c 100644
--- a/Source/cmGlobalVisualStudio6Generator.cxx
+++ b/Source/cmGlobalVisualStudio6Generator.cxx
@@ -255,7 +255,7 @@ void cmGlobalVisualStudio6Generator
 ::OutputDSWFile(cmLocalGenerator* root,
                 std::vector<cmLocalGenerator*>& generators)
 {
-  if(generators.size() == 0)
+  if(generators.empty())
     {
     return;
     }
diff --git a/Source/cmGlobalVisualStudio71Generator.cxx b/Source/cmGlobalVisualStudio71Generator.cxx
index f7b6470..607642c 100644
--- a/Source/cmGlobalVisualStudio71Generator.cxx
+++ b/Source/cmGlobalVisualStudio71Generator.cxx
@@ -212,7 +212,7 @@ cmGlobalVisualStudio71Generator
     {
     const char* name = di->c_str();
     std::string guid = this->GetGUID(name);
-    if(guid.size() == 0)
+    if(guid.empty())
       {
       std::string m = "Target: ";
       m += target.GetName();
diff --git a/Source/cmGlobalVisualStudio7Generator.cxx b/Source/cmGlobalVisualStudio7Generator.cxx
index f8d882c..2660d23 100644
--- a/Source/cmGlobalVisualStudio7Generator.cxx
+++ b/Source/cmGlobalVisualStudio7Generator.cxx
@@ -359,7 +359,7 @@ void cmGlobalVisualStudio7Generator
 ::OutputSLNFile(cmLocalGenerator* root,
                 std::vector<cmLocalGenerator*>& generators)
 {
-  if(generators.size() == 0)
+  if(generators.empty())
     {
     return;
     }
@@ -736,7 +736,7 @@ cmGlobalVisualStudio7Generator
     {
     const char* name = di->c_str();
     std::string guid = this->GetGUID(name);
-    if(guid.size() == 0)
+    if(guid.empty())
       {
       std::string m = "Target: ";
       m += target.GetName();
diff --git a/Source/cmLocalVisualStudio6Generator.cxx b/Source/cmLocalVisualStudio6Generator.cxx
index 29e1034..5b78f0d 100644
--- a/Source/cmLocalVisualStudio6Generator.cxx
+++ b/Source/cmLocalVisualStudio6Generator.cxx
@@ -988,7 +988,7 @@ void cmLocalVisualStudio6Generator
     {
     std::string lpath =
       this->ConvertToOutputFormat(libPath.c_str(), SHELL);
-    if(lpath.size() == 0)
+    if(lpath.empty())
       {
       lpath = ".";
       }
@@ -1021,7 +1021,7 @@ void cmLocalVisualStudio6Generator
     {
     std::string lpath =
       this->ConvertToOutputFormat(exePath.c_str(), SHELL);
-    if(lpath.size() == 0)
+    if(lpath.empty())
       {
       lpath = ".";
       }
@@ -1062,7 +1062,7 @@ void cmLocalVisualStudio6Generator
       }
     std::string lpath =
       this->ConvertToOutputFormat(path.c_str(), SHELL);
-    if(lpath.size() == 0)
+    if(lpath.empty())
       {
       lpath = ".";
       }
diff --git a/Source/cmLocalVisualStudio7Generator.cxx b/Source/cmLocalVisualStudio7Generator.cxx
index a38a061..2445995 100644
--- a/Source/cmLocalVisualStudio7Generator.cxx
+++ b/Source/cmLocalVisualStudio7Generator.cxx
@@ -2331,7 +2331,7 @@ void cmLocalVisualStudio7Generator::ReadAndStoreExternalGUID(
   cmVS7XMLParser parser;
   parser.ParseFile(path);
   // if we can not find a GUID then we will generate one later
-  if(parser.GUID.size() == 0)
+  if(parser.GUID.empty())
     {
     return;
     }
diff --git a/Source/cmVisualStudio10TargetGenerator.cxx b/Source/cmVisualStudio10TargetGenerator.cxx
index 80b8591..a6568f1 100644
--- a/Source/cmVisualStudio10TargetGenerator.cxx
+++ b/Source/cmVisualStudio10TargetGenerator.cxx
@@ -2783,7 +2783,7 @@ void cmVisualStudio10TargetGenerator::WriteEvent(
   std::vector<cmCustomCommand> const& commands,
   std::string const& configName)
 {
-  if(commands.size() == 0)
+  if(commands.empty())
     {
     return;
     }
diff --git a/Source/cmXCode21Object.cxx b/Source/cmXCode21Object.cxx
index f30f700..3973540 100644
--- a/Source/cmXCode21Object.cxx
+++ b/Source/cmXCode21Object.cxx
@@ -22,7 +22,7 @@ cmXCode21Object::cmXCode21Object(PBXType ptype, Type type)
 //----------------------------------------------------------------------------
 void cmXCode21Object::PrintComment(std::ostream& out)
 {
-  if(this->Comment.size() == 0)
+  if(this->Comment.empty())
     {
     cmXCodeObject* n = this->GetObject("name");
     if(n)

http://cmake.org/gitweb?p=cmake.git;a=commitdiff;h=0e14c7ee6375fcaa975194557523f5a1a8686a8a
commit 0e14c7ee6375fcaa975194557523f5a1a8686a8a
Author:     Stephen Kelly <steveire at gmail.com>
AuthorDate: Fri Jan 16 01:10:07 2015 +0100
Commit:     Stephen Kelly <steveire at gmail.com>
CommitDate: Mon Aug 24 20:47:17 2015 +0200

    Replace 'foo.size() > 0' pattern with !foo.empty().

diff --git a/Source/CPack/IFW/cmCPackIFWGenerator.cxx b/Source/CPack/IFW/cmCPackIFWGenerator.cxx
index 09e123c..43d34ee 100644
--- a/Source/CPack/IFW/cmCPackIFWGenerator.cxx
+++ b/Source/CPack/IFW/cmCPackIFWGenerator.cxx
@@ -191,7 +191,7 @@ int cmCPackIFWGenerator::PackageFiles()
       }
     }
   // TODO: set correct name for multipackages
-  if (this->packageFileNames.size() > 0)
+  if (!this->packageFileNames.empty())
     {
     ifwCmd += " " + packageFileNames[0];
     }
diff --git a/Source/cmGlobalVisualStudio71Generator.cxx b/Source/cmGlobalVisualStudio71Generator.cxx
index 1ab4c9c..f7b6470 100644
--- a/Source/cmGlobalVisualStudio71Generator.cxx
+++ b/Source/cmGlobalVisualStudio71Generator.cxx
@@ -250,7 +250,7 @@ void cmGlobalVisualStudio71Generator
     std::set<std::string>::const_iterator it;
     for(it = depends.begin(); it != depends.end(); ++it)
       {
-      if(it->size() > 0)
+      if(!it->empty())
         {
         fout << "\t\t{"
              << this->GetGUID(it->c_str())
diff --git a/Source/cmGlobalVisualStudioGenerator.cxx b/Source/cmGlobalVisualStudioGenerator.cxx
index c38a35a..553d568 100644
--- a/Source/cmGlobalVisualStudioGenerator.cxx
+++ b/Source/cmGlobalVisualStudioGenerator.cxx
@@ -265,7 +265,7 @@ cmGlobalVisualStudioGenerator
         {
         std::vector<std::string> filenames;
         this->GetFilesReplacedDuringGenerate(filenames);
-        if (filenames.size() > 0)
+        if (!filenames.empty())
           {
           // Convert vector to semi-colon delimited string of filenames:
           std::string projects;

-----------------------------------------------------------------------

Summary of changes:
 Source/CPack/IFW/cmCPackIFWGenerator.cxx    |    2 +-
 Source/CPack/WiX/cmCPackWIXGenerator.cxx    |    4 ++--
 Source/CPack/WiX/cmWIXAccessControlList.cxx |    2 +-
 Source/CPack/WiX/cmWIXPatch.cxx             |    2 +-
 Source/CPack/WiX/cmWIXSourceWriter.cxx      |    2 +-
 Source/CPack/cmCPackNSISGenerator.cxx       |    6 +++---
 Source/cmCallVisualStudioMacro.cxx          |    2 +-
 Source/cmGlobalMSYSMakefileGenerator.cxx    |    6 +++---
 Source/cmGlobalVisualStudio6Generator.cxx   |    2 +-
 Source/cmGlobalVisualStudio71Generator.cxx  |    4 ++--
 Source/cmGlobalVisualStudio7Generator.cxx   |    4 ++--
 Source/cmGlobalVisualStudioGenerator.cxx    |    4 ++--
 Source/cmGlobalXCodeGenerator.cxx           |    6 +++---
 Source/cmLocalVisualStudio10Generator.cxx   |    2 +-
 Source/cmLocalVisualStudio6Generator.cxx    |   14 +++++++-------
 Source/cmLocalVisualStudio7Generator.cxx    |    4 ++--
 Source/cmVisualStudio10TargetGenerator.cxx  |    8 ++++----
 Source/cmVisualStudioGeneratorOptions.cxx   |    6 +++---
 Source/cmXCode21Object.cxx                  |    2 +-
 19 files changed, 41 insertions(+), 41 deletions(-)


hooks/post-receive
-- 
CMake


More information about the Cmake-commits mailing list