[Cmake-commits] CMake branch, next, updated. v2.8.10.2-1313-g1be4b80

[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  1be4b803705b3350511b850261d3ee5159409030 (commit)
       via  7d736af60e554e32115fdc188140fd63232d09c9 (commit)
      from  bb64f91d7bb45f68e6bc1db13a1af2ee3fee385d (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=1be4b803705b3350511b850261d3ee5159409030
commit 1be4b803705b3350511b850261d3ee5159409030
Merge: bb64f91 7d736af
Author:     Stephen Kelly <steveire at gmail.com>
AuthorDate: Sun Dec 23 10:37:43 2012 -0500
Commit:     CMake Topic Stage <kwrobot at kitware.com>
CommitDate: Sun Dec 23 10:37:43 2012 -0500

    Merge topic 'genex-cleanup' into next
    
    7d736af Replace some 'if' with 'else if'


http://cmake.org/gitweb?p=cmake.git;a=commitdiff;h=7d736af60e554e32115fdc188140fd63232d09c9
commit 7d736af60e554e32115fdc188140fd63232d09c9
Author:     Stephen Kelly <steveire at gmail.com>
AuthorDate: Mon Dec 10 11:32:42 2012 +0100
Commit:     Stephen Kelly <steveire at gmail.com>
CommitDate: Sun Dec 23 16:37:01 2012 +0100

    Replace some 'if' with 'else if'
    
    For consistency with the rest of the method.

diff --git a/Source/cmGeneratorExpressionEvaluator.cxx b/Source/cmGeneratorExpressionEvaluator.cxx
index 102927e..3b7cfc0 100644
--- a/Source/cmGeneratorExpressionEvaluator.cxx
+++ b/Source/cmGeneratorExpressionEvaluator.cxx
@@ -553,13 +553,13 @@ cmGeneratorExpressionNode* GetNode(const std::string &identifier)
 {
   if (identifier == "0")
     return &zeroNode;
-  if (identifier == "1")
+  else if (identifier == "1")
     return &oneNode;
-  if (identifier == "AND")
+  else if (identifier == "AND")
     return &andNode;
-  if (identifier == "OR")
+  else if (identifier == "OR")
     return &orNode;
-  if (identifier == "NOT")
+  else if (identifier == "NOT")
     return &notNode;
   else if (identifier == "CONFIGURATION")
     return &configurationNode;

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

Summary of changes:
 Source/cmGeneratorExpressionEvaluator.cxx |    8 ++++----
 1 files changed, 4 insertions(+), 4 deletions(-)


hooks/post-receive
-- 
CMake