[Cmake-commits] CMake branch, next, updated. v3.1.2-1292-ge610103

[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  e610103fe20600300893e78426ade8c645ee87bb (commit)
       via  ee340f7a764bde9f4875fa927be5343a275c583b (commit)
      from  6f86f8a5626d8dc7ee84e7acddc8173189a28a76 (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=e610103fe20600300893e78426ade8c645ee87bb
commit e610103fe20600300893e78426ade8c645ee87bb
Merge: 6f86f8a ee340f7
Author:     Stephen Kelly <steveire at gmail.com>
AuthorDate: Wed Feb 11 16:49:40 2015 -0500
Commit:     CMake Topic Stage <kwrobot at kitware.com>
CommitDate: Wed Feb 11 16:49:40 2015 -0500

    Merge topic 'clean-up-cmMacroCommand' into next
    
    ee340f7a fixup! cmMacroCommand: Move computation of ARGV%n names out of double loop.


http://cmake.org/gitweb?p=cmake.git;a=commitdiff;h=ee340f7a764bde9f4875fa927be5343a275c583b
commit ee340f7a764bde9f4875fa927be5343a275c583b
Author:     Stephen Kelly <steveire at gmail.com>
AuthorDate: Wed Feb 11 22:45:20 2015 +0100
Commit:     Stephen Kelly <steveire at gmail.com>
CommitDate: Wed Feb 11 22:49:16 2015 +0100

    fixup! cmMacroCommand: Move computation of ARGV%n names out of double loop.

diff --git a/Source/cmMacroCommand.cxx b/Source/cmMacroCommand.cxx
index 7f21d44..29e8cb1 100644
--- a/Source/cmMacroCommand.cxx
+++ b/Source/cmMacroCommand.cxx
@@ -113,13 +113,13 @@ bool cmMacroHelperCommand::InvokeInitialPass
   std::string expandedArgv = cmJoin(expandedArgs, ";");
   std::vector<std::string> variables;
   variables.reserve(this->Args.size() - 1);
-  std::vector<std::string> argVs;
-  argVs.reserve(this->Args.size() - 1);
-  char argvName[60];
   for (unsigned int j = 1; j < this->Args.size(); ++j)
     {
     variables.push_back("${" + this->Args[j] + "}");
     }
+  std::vector<std::string> argVs;
+  argVs.reserve(expandedArgs.size());
+  char argvName[60];
   for (unsigned int j = 0; j < expandedArgs.size(); ++j)
     {
     sprintf(argvName,"${ARGV%i}",j);

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

Summary of changes:
 Source/cmMacroCommand.cxx |    6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)


hooks/post-receive
-- 
CMake