[Cmake-commits] CMake branch, next, updated. v3.5.1-883-g2f87082

[Brad King]

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  2f87082da96c6fa439ca2d913c7c63e527bc97f3 (commit)
       via  aff4a5fab543ab7dfb87d1d12961c85a28022a2b (commit)
      from  b444ad46b3185638355575c65da0b8df29f52f60 (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 -----------------------------------------------------------------
https://cmake.org/gitweb?p=cmake.git;a=commitdiff;h=2f87082da96c6fa439ca2d913c7c63e527bc97f3
commit 2f87082da96c6fa439ca2d913c7c63e527bc97f3
Merge: b444ad4 aff4a5f
Author:     Brad King <brad.king at kitware.com>
AuthorDate: Fri Apr 8 10:47:30 2016 -0400
Commit:     CMake Topic Stage <kwrobot at kitware.com>
CommitDate: Fri Apr 8 10:47:30 2016 -0400

    Merge topic 'preallocate-condition-keywords' into next
    
    aff4a5fa cmConditionEvaluator: Use pre-allocated keywords in more places


https://cmake.org/gitweb?p=cmake.git;a=commitdiff;h=aff4a5fab543ab7dfb87d1d12961c85a28022a2b
commit aff4a5fab543ab7dfb87d1d12961c85a28022a2b
Author:     Brad King <brad.king at kitware.com>
AuthorDate: Fri Apr 8 10:45:25 2016 -0400
Commit:     Brad King <brad.king at kitware.com>
CommitDate: Fri Apr 8 10:45:43 2016 -0400

    cmConditionEvaluator: Use pre-allocated keywords in more places
    
    Inspired-by: Harry Mallon <Harry at codexdigital.com>

diff --git a/Source/cmConditionEvaluator.cxx b/Source/cmConditionEvaluator.cxx
index 305ebe3..e63f486 100644
--- a/Source/cmConditionEvaluator.cxx
+++ b/Source/cmConditionEvaluator.cxx
@@ -682,11 +682,11 @@ bool cmConditionEvaluator::HandleLevel2(cmArgumentList &newArgs,
           {
           result = false;
           }
-        else if (*(argP1) == "LESS")
+        else if (*(argP1) == keyLESS)
           {
           result = (lhs < rhs);
           }
-        else if (*(argP1) == "GREATER")
+        else if (*(argP1) == keyGREATER)
           {
           result = (lhs > rhs);
           }
@@ -707,11 +707,11 @@ bool cmConditionEvaluator::HandleLevel2(cmArgumentList &newArgs,
         def2 = this->GetVariableOrString(*argP2);
         int val = strcmp(def,def2);
         bool result;
-        if (*(argP1) == "STRLESS")
+        if (*(argP1) == keySTRLESS)
           {
           result = (val < 0);
           }
-        else if (*(argP1) == "STRGREATER")
+        else if (*(argP1) == keySTRGREATER)
           {
           result = (val > 0);
           }

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

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


hooks/post-receive
-- 
CMake