[Cmake-commits] CMake branch, next, updated. v3.1.2-1290-g6f86f8a

[Brad King]

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  6f86f8a5626d8dc7ee84e7acddc8173189a28a76 (commit)
       via  9d2ef95e828f002144279e5a90bb18d17f83e62f (commit)
      from  1af2299bd96f8d75142af21439a81a4038608198 (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=6f86f8a5626d8dc7ee84e7acddc8173189a28a76
commit 6f86f8a5626d8dc7ee84e7acddc8173189a28a76
Merge: 1af2299 9d2ef95
Author:     Brad King <brad.king at kitware.com>
AuthorDate: Wed Feb 11 16:44:46 2015 -0500
Commit:     CMake Topic Stage <kwrobot at kitware.com>
CommitDate: Wed Feb 11 16:44:46 2015 -0500

    Merge topic 'clean-up-cmMacroCommand' into next
    
    9d2ef95e cmMacroCommand: Respect valid iterator range


http://cmake.org/gitweb?p=cmake.git;a=commitdiff;h=9d2ef95e828f002144279e5a90bb18d17f83e62f
commit 9d2ef95e828f002144279e5a90bb18d17f83e62f
Author:     Brad King <brad.king at kitware.com>
AuthorDate: Wed Feb 11 16:43:29 2015 -0500
Commit:     Brad King <brad.king at kitware.com>
CommitDate: Wed Feb 11 16:43:29 2015 -0500

    cmMacroCommand: Respect valid iterator range
    
    Do not allow even a temporary iterator to sit out of range.

diff --git a/Source/cmMacroCommand.cxx b/Source/cmMacroCommand.cxx
index e2751f9..7f21d44 100644
--- a/Source/cmMacroCommand.cxx
+++ b/Source/cmMacroCommand.cxx
@@ -108,7 +108,7 @@ bool cmMacroHelperCommand::InvokeInitialPass
   std::string argcDef = argcDefStream.str();
 
   std::vector<std::string>::const_iterator eit
-      = expandedArgs.begin() + this->Args.size() - 1;
+      = expandedArgs.begin() + (this->Args.size() - 1);
   std::string expandedArgn = cmJoin(cmRange(eit, expandedArgs.end()), ";");
   std::string expandedArgv = cmJoin(expandedArgs, ";");
   std::vector<std::string> variables;

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

Summary of changes:
 Source/cmMacroCommand.cxx |    2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)


hooks/post-receive
-- 
CMake