[Cmake-commits] CMake branch, next, updated. v2.8.10.2-1869-g53aa4f3

[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  53aa4f3d7271e343eaa6e58067d1c60c10eed8b6 (commit)
       via  0c23e60b793e8f2c808580ffdebb7eea571ea862 (commit)
       via  da026cde33d22c6a6bd1f9a91f7ceea8d1a625d0 (commit)
      from  b9d91c163c82cb1035804ac26046d3476a9707d6 (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=53aa4f3d7271e343eaa6e58067d1c60c10eed8b6
commit 53aa4f3d7271e343eaa6e58067d1c60c10eed8b6
Merge: b9d91c1 0c23e60
Author:     Stephen Kelly <steveire at gmail.com>
AuthorDate: Sat Feb 2 07:45:28 2013 -0500
Commit:     CMake Topic Stage <kwrobot at kitware.com>
CommitDate: Sat Feb 2 07:45:28 2013 -0500

    Merge topic 'tll-includes-defines' into next
    
    0c23e60 Refactor a find to maybe be less confusing to bcc.
    da026cd Don't put an else after a return.


http://cmake.org/gitweb?p=cmake.git;a=commitdiff;h=0c23e60b793e8f2c808580ffdebb7eea571ea862
commit 0c23e60b793e8f2c808580ffdebb7eea571ea862
Author:     Stephen Kelly <steveire at gmail.com>
AuthorDate: Sat Feb 2 13:44:43 2013 +0100
Commit:     Stephen Kelly <steveire at gmail.com>
CommitDate: Sat Feb 2 13:44:43 2013 +0100

    Refactor a find to maybe be less confusing to bcc.

diff --git a/Source/cmGeneratorExpressionDAGChecker.cxx b/Source/cmGeneratorExpressionDAGChecker.cxx
index 267ac8b..d81b7a0 100644
--- a/Source/cmGeneratorExpressionDAGChecker.cxx
+++ b/Source/cmGeneratorExpressionDAGChecker.cxx
@@ -38,11 +38,14 @@ cmGeneratorExpressionDAGChecker::cmGeneratorExpressionDAGChecker(
     {
     std::map<cmStdString, std::set<cmStdString> >::const_iterator it
                                                     = top->Seen.find(target);
-    if (it != top->Seen.end()
-        && it->second.find(property) != it->second.end())
+    if (it != top->Seen.end())
       {
-      this->CheckResult = ALREADY_SEEN;
-      return;
+      const std::set<cmStdString> &propSet = it->second;
+      if (propSet.find(property) != propSet.end())
+        {
+        this->CheckResult = ALREADY_SEEN;
+        return;
+        }
       }
     const_cast<cmGeneratorExpressionDAGChecker *>(top)
                                             ->Seen[target].insert(property);

http://cmake.org/gitweb?p=cmake.git;a=commitdiff;h=da026cde33d22c6a6bd1f9a91f7ceea8d1a625d0
commit da026cde33d22c6a6bd1f9a91f7ceea8d1a625d0
Author:     Stephen Kelly <steveire at gmail.com>
AuthorDate: Sat Feb 2 13:43:38 2013 +0100
Commit:     Stephen Kelly <steveire at gmail.com>
CommitDate: Sat Feb 2 13:43:38 2013 +0100

    Don't put an else after a return.

diff --git a/Source/cmGeneratorExpressionDAGChecker.cxx b/Source/cmGeneratorExpressionDAGChecker.cxx
index aa61783..267ac8b 100644
--- a/Source/cmGeneratorExpressionDAGChecker.cxx
+++ b/Source/cmGeneratorExpressionDAGChecker.cxx
@@ -44,11 +44,8 @@ cmGeneratorExpressionDAGChecker::cmGeneratorExpressionDAGChecker(
       this->CheckResult = ALREADY_SEEN;
       return;
       }
-    else
-      {
-      const_cast<cmGeneratorExpressionDAGChecker *>(top)
-                                              ->Seen[target].insert(property);
-      }
+    const_cast<cmGeneratorExpressionDAGChecker *>(top)
+                                            ->Seen[target].insert(property);
     }
 }
 

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

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


hooks/post-receive
-- 
CMake