[Cmake-commits] CMake branch, next, updated. v2.8.10.2-1871-g0949649

Stephen Kelly steveire at gmail.com
Sat Feb 2 08:12:59 EST 2013


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  094964937d6b05c36962dae258a15bad4d09c1b7 (commit)
       via  71c61213641524979134b9682f66ca426cbc24b1 (commit)
      from  53aa4f3d7271e343eaa6e58067d1c60c10eed8b6 (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=094964937d6b05c36962dae258a15bad4d09c1b7
commit 094964937d6b05c36962dae258a15bad4d09c1b7
Merge: 53aa4f3 71c6121
Author:     Stephen Kelly <steveire at gmail.com>
AuthorDate: Sat Feb 2 08:12:57 2013 -0500
Commit:     CMake Topic Stage <kwrobot at kitware.com>
CommitDate: Sat Feb 2 08:12:57 2013 -0500

    Merge topic 'tll-includes-defines' into next
    
    71c6121 Create a const iterator explicitly.


http://cmake.org/gitweb?p=cmake.git;a=commitdiff;h=71c61213641524979134b9682f66ca426cbc24b1
commit 71c61213641524979134b9682f66ca426cbc24b1
Author:     Stephen Kelly <steveire at gmail.com>
AuthorDate: Sat Feb 2 14:11:52 2013 +0100
Commit:     Stephen Kelly <steveire at gmail.com>
CommitDate: Sat Feb 2 14:11:52 2013 +0100

    Create a const iterator explicitly.

diff --git a/Source/cmGeneratorExpressionDAGChecker.cxx b/Source/cmGeneratorExpressionDAGChecker.cxx
index d81b7a0..b9069ef 100644
--- a/Source/cmGeneratorExpressionDAGChecker.cxx
+++ b/Source/cmGeneratorExpressionDAGChecker.cxx
@@ -41,7 +41,8 @@ cmGeneratorExpressionDAGChecker::cmGeneratorExpressionDAGChecker(
     if (it != top->Seen.end())
       {
       const std::set<cmStdString> &propSet = it->second;
-      if (propSet.find(property) != propSet.end())
+      const std::set<cmStdString>::const_iterator i = propSet.find(property);
+      if (i != propSet.end())
         {
         this->CheckResult = ALREADY_SEEN;
         return;

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

Summary of changes:
 Source/cmGeneratorExpressionDAGChecker.cxx |    3 ++-
 1 files changed, 2 insertions(+), 1 deletions(-)


hooks/post-receive
-- 
CMake


More information about the Cmake-commits mailing list