[Cmake-commits] CMake branch, next, updated. v3.1.0-2123-gbc08c11

[Stephen Kelly]

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  bc08c11db52548e4ccac239d3204b83256f3fba2 (commit)
       via  b54225732f6b46c8f2ab0b2dd76ffa04d173b2f0 (commit)
       via  92a37f92791f801d378b49fd86f097391facd02e (commit)
       via  aac44e71e6a6c2630f1c1e61b34cf91aa775dc02 (commit)
      from  a9a2dbf8dbdc3935ceab3ef560d4185503c98ead (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=bc08c11db52548e4ccac239d3204b83256f3fba2
commit bc08c11db52548e4ccac239d3204b83256f3fba2
Merge: a9a2dbf b542257
Author:     Stephen Kelly <steveire at gmail.com>
AuthorDate: Sun Jan 18 09:29:25 2015 -0500
Commit:     CMake Topic Stage <kwrobot at kitware.com>
CommitDate: Sun Jan 18 09:29:25 2015 -0500

    Merge topic 'use-member-insert' into next
    
    b5422573 cmListCommand: Replace loop with member algorithm.
    92a37f92 Convert raw loops to set member insert.
    aac44e71 Convert raw loops to vector member insert.


http://cmake.org/gitweb?p=cmake.git;a=commitdiff;h=b54225732f6b46c8f2ab0b2dd76ffa04d173b2f0
commit b54225732f6b46c8f2ab0b2dd76ffa04d173b2f0
Author:     Stephen Kelly <steveire at gmail.com>
AuthorDate: Thu Jan 15 02:59:09 2015 +0100
Commit:     Stephen Kelly <steveire at gmail.com>
CommitDate: Sun Jan 18 15:15:17 2015 +0100

    cmListCommand: Replace loop with member algorithm.

diff --git a/Source/cmListCommand.cxx b/Source/cmListCommand.cxx
index c3f0f57..5a0eee3 100644
--- a/Source/cmListCommand.cxx
+++ b/Source/cmListCommand.cxx
@@ -345,13 +345,9 @@ bool cmListCommand::HandleInsertCommand(std::vector<std::string> const& args)
       return false;
       }
     }
-  size_t cc;
-  size_t cnt = 0;
-  for ( cc = 3; cc < args.size(); ++ cc )
-    {
-    varArgsExpanded.insert(varArgsExpanded.begin()+item+cnt, args[cc]);
-    cnt ++;
-    }
+
+  varArgsExpanded.insert(varArgsExpanded.begin()+item,
+                         args.begin() + 3, args.end());
 
   std::string value = cmJoin(varArgsExpanded, ";");
   this->Makefile->AddDefinition(listName, value.c_str());

http://cmake.org/gitweb?p=cmake.git;a=commitdiff;h=92a37f92791f801d378b49fd86f097391facd02e
commit 92a37f92791f801d378b49fd86f097391facd02e
Author:     Stephen Kelly <steveire at gmail.com>
AuthorDate: Thu Jan 15 03:09:43 2015 +0100
Commit:     Stephen Kelly <steveire at gmail.com>
CommitDate: Sun Jan 18 15:14:47 2015 +0100

    Convert raw loops to set member insert.

diff --git a/Source/cmGeneratorExpression.cxx b/Source/cmGeneratorExpression.cxx
index b2a2386..bf96951 100644
--- a/Source/cmGeneratorExpression.cxx
+++ b/Source/cmGeneratorExpression.cxx
@@ -98,12 +98,8 @@ const char *cmCompiledGeneratorExpression::Evaluate(
     {
     this->Output += (*it)->Evaluate(&context, dagChecker);
 
-    for(std::set<std::string>::const_iterator
-          p = context.SeenTargetProperties.begin();
-          p != context.SeenTargetProperties.end(); ++p)
-      {
-      this->SeenTargetProperties.insert(*p);
-      }
+    this->SeenTargetProperties.insert(context.SeenTargetProperties.begin(),
+                                      context.SeenTargetProperties.end());
     if (context.HadError)
       {
       this->Output = "";
diff --git a/Source/cmLoadCacheCommand.cxx b/Source/cmLoadCacheCommand.cxx
index 427e29d..4f6e0c3 100644
--- a/Source/cmLoadCacheCommand.cxx
+++ b/Source/cmLoadCacheCommand.cxx
@@ -110,10 +110,7 @@ bool cmLoadCacheCommand::ReadWithPrefix(std::vector<std::string> const& args)
 
   // Prepare the table of variables to read.
   this->Prefix = args[2];
-  for(unsigned int i=3; i < args.size(); ++i)
-    {
-    this->VariablesToRead.insert(args[i]);
-    }
+  this->VariablesToRead.insert(args.begin() + 3, args.end());
 
   // Read the cache file.
   cmsys::ifstream fin(cacheFile.c_str());

http://cmake.org/gitweb?p=cmake.git;a=commitdiff;h=aac44e71e6a6c2630f1c1e61b34cf91aa775dc02
commit aac44e71e6a6c2630f1c1e61b34cf91aa775dc02
Author:     Stephen Kelly <steveire at gmail.com>
AuthorDate: Wed Jan 14 21:26:44 2015 +0100
Commit:     Stephen Kelly <steveire at gmail.com>
CommitDate: Sun Jan 18 15:14:36 2015 +0100

    Convert raw loops to vector member insert.

diff --git a/Source/cmComputeLinkDepends.cxx b/Source/cmComputeLinkDepends.cxx
index f0bae28..32d5cd3 100644
--- a/Source/cmComputeLinkDepends.cxx
+++ b/Source/cmComputeLinkDepends.cxx
@@ -676,11 +676,8 @@ void cmComputeLinkDepends::InferDependencies()
       }
 
     // Add the inferred dependencies to the graph.
-    for(DependSet::const_iterator j = common.begin(); j != common.end(); ++j)
-      {
-      int dependee_index = *j;
-      this->EntryConstraintGraph[depender_index].push_back(dependee_index);
-      }
+    cmGraphEdgeList& edges = this->EntryConstraintGraph[depender_index];
+    edges.insert(edges.end(), common.begin(), common.end());
     }
 }
 
diff --git a/Source/cmLocalUnixMakefileGenerator3.cxx b/Source/cmLocalUnixMakefileGenerator3.cxx
index ebaee37..46279fa 100644
--- a/Source/cmLocalUnixMakefileGenerator3.cxx
+++ b/Source/cmLocalUnixMakefileGenerator3.cxx
@@ -738,11 +738,8 @@ cmLocalUnixMakefileGenerator3
   // Add the output to the local help if requested.
   if(in_help)
     {
-    for (std::vector<std::string>::const_iterator i = outputs.begin();
-         i != outputs.end(); ++i)
-      {
-      this->LocalHelp.push_back(*i);
-      }
+    this->LocalHelp.insert(this->LocalHelp.end(),
+                           outputs.begin(), outputs.end());
     }
 }
 

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

Summary of changes:
 Source/cmComputeLinkDepends.cxx          |    7 ++-----
 Source/cmGeneratorExpression.cxx         |    8 ++------
 Source/cmListCommand.cxx                 |   10 +++-------
 Source/cmLoadCacheCommand.cxx            |    5 +----
 Source/cmLocalUnixMakefileGenerator3.cxx |    7 ++-----
 5 files changed, 10 insertions(+), 27 deletions(-)


hooks/post-receive
-- 
CMake