[Cmake-commits] CMake branch, next, updated. v3.2.2-2208-g258e711
Stephen Kelly
steveire at gmail.com
Mon Apr 27 15:42:37 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 258e711e9bc68bd745ec01aefe5e0ae98b493c11 (commit)
via 0fe78d69f45c57b6987cccf020aa0d35710a0c12 (commit)
from 37da4f82065020834d31588bb1b373ef77e2f5b8 (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=258e711e9bc68bd745ec01aefe5e0ae98b493c11
commit 258e711e9bc68bd745ec01aefe5e0ae98b493c11
Merge: 37da4f8 0fe78d6
Author: Stephen Kelly <steveire at gmail.com>
AuthorDate: Mon Apr 27 15:42:36 2015 -0400
Commit: CMake Topic Stage <kwrobot at kitware.com>
CommitDate: Mon Apr 27 15:42:36 2015 -0400
Merge topic 'refactor-cmDefinitions' into next
0fe78d69 Wrap lines.
http://cmake.org/gitweb?p=cmake.git;a=commitdiff;h=0fe78d69f45c57b6987cccf020aa0d35710a0c12
commit 0fe78d69f45c57b6987cccf020aa0d35710a0c12
Author: Stephen Kelly <steveire at gmail.com>
AuthorDate: Mon Apr 27 21:42:10 2015 +0200
Commit: Stephen Kelly <steveire at gmail.com>
CommitDate: Mon Apr 27 21:42:10 2015 +0200
Wrap lines.
diff --git a/Source/cmMakefile.cxx b/Source/cmMakefile.cxx
index d169765..b46c99f 100644
--- a/Source/cmMakefile.cxx
+++ b/Source/cmMakefile.cxx
@@ -116,11 +116,12 @@ public:
{
std::vector<std::string> closureKeys;
std::vector<std::string> undefinedKeys;
- for (std::vector<cmDefinitions>::const_iterator it = this->VarStack.begin();
- it != this->VarStack.end(); ++it)
+ for (std::vector<cmDefinitions>::const_iterator it
+ = this->VarStack.begin(); it != this->VarStack.end(); ++it)
{
std::vector<std::string> const& localKeys = it->Keys(undefinedKeys);
- closureKeys.insert(closureKeys.end(), localKeys.begin(), localKeys.end());
+ closureKeys.insert(closureKeys.end(),
+ localKeys.begin(), localKeys.end());
std::vector<std::string>::iterator newIt =
closureKeys.end() - localKeys.size();
std::inplace_merge(closureKeys.begin(), newIt, closureKeys.end());
-----------------------------------------------------------------------
Summary of changes:
Source/cmMakefile.cxx | 7 ++++---
1 file changed, 4 insertions(+), 3 deletions(-)
hooks/post-receive
--
CMake
More information about the Cmake-commits
mailing list