[Cmake-commits] CMake branch, next, updated. v2.8.9-600-g3a40dbd
Brad King
brad.king at kitware.com
Tue Sep 18 17:00:41 EDT 2012
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 3a40dbdc2c322b0471add8413dec92f266f603c3 (commit)
via 99af39d6b86db47d4a7a025b0b852f6ab26c478c (commit)
from b78f49705a3e1df70d1dad9512529e99fb1a3719 (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=3a40dbdc2c322b0471add8413dec92f266f603c3
commit 3a40dbdc2c322b0471add8413dec92f266f603c3
Merge: b78f497 99af39d
Author: Brad King <brad.king at kitware.com>
AuthorDate: Tue Sep 18 17:00:39 2012 -0400
Commit: CMake Topic Stage <kwrobot at kitware.com>
CommitDate: Tue Sep 18 17:00:39 2012 -0400
Merge topic 'generator-expression-refactor' into next
99af39d cmTarget: Fix style for targets set insertion
http://cmake.org/gitweb?p=cmake.git;a=commitdiff;h=99af39d6b86db47d4a7a025b0b852f6ab26c478c
commit 99af39d6b86db47d4a7a025b0b852f6ab26c478c
Author: Brad King <brad.king at kitware.com>
AuthorDate: Tue Sep 18 16:59:00 2012 -0400
Commit: Brad King <brad.king at kitware.com>
CommitDate: Tue Sep 18 16:59:02 2012 -0400
cmTarget: Fix style for targets set insertion
Remove a comment referencing dashboard machines. Use our standard for
loop iteration style.
diff --git a/Source/cmTarget.cxx b/Source/cmTarget.cxx
index 6219da6..9a3812c 100644
--- a/Source/cmTarget.cxx
+++ b/Source/cmTarget.cxx
@@ -1652,12 +1652,8 @@ cmTargetTraceDependencies
const cmCompiledGeneratorExpression &cge = ge.Parse(*cli);
cge.Evaluate(this->Makefile, 0, true);
std::set<cmTarget*> geTargets = cge.GetTargets();
- // A handful of machines on the dashboard don't have the
- // iterator overload below, so we have to do it manually.
-// targets.insert(geTargets.begin(), geTargets.end());
- std::set<cmTarget*>::const_iterator it = geTargets.begin();
- const std::set<cmTarget*>::const_iterator end = geTargets.end();
- for ( ; it != end; ++it)
+ for(std::set<cmTarget*>::const_iterator it = geTargets.begin();
+ it != geTargets.end(); ++it)
{
targets.insert(*it);
}
-----------------------------------------------------------------------
Summary of changes:
Source/cmTarget.cxx | 8 ++------
1 files changed, 2 insertions(+), 6 deletions(-)
hooks/post-receive
--
CMake
More information about the Cmake-commits
mailing list