diff options
| author | Brad King <brad.king@kitware.com> | 2016-04-11 13:38:58 (GMT) |
|---|---|---|
| committer | CMake Topic Stage <kwrobot@kitware.com> | 2016-04-11 13:38:58 (GMT) |
| commit | 3a556f005db9d1e35514d4d50c219d69f0850bd1 (patch) | |
| tree | bdc738ada10ebaae186f36dfb3df449135956600 | |
| parent | 335b5430bf9fb27b497b5272e2afc4cfd01217bf (diff) | |
| parent | aff4a5fab543ab7dfb87d1d12961c85a28022a2b (diff) | |
| download | CMake-3a556f005db9d1e35514d4d50c219d69f0850bd1.zip CMake-3a556f005db9d1e35514d4d50c219d69f0850bd1.tar.gz CMake-3a556f005db9d1e35514d4d50c219d69f0850bd1.tar.bz2 | |
Merge topic 'preallocate-condition-keywords'
aff4a5fa cmConditionEvaluator: Use pre-allocated keywords in more places
| -rw-r--r-- | Source/cmConditionEvaluator.cxx | 8 |
1 files changed, 4 insertions, 4 deletions
diff --git a/Source/cmConditionEvaluator.cxx b/Source/cmConditionEvaluator.cxx index 64c5980..07c9dd6 100644 --- a/Source/cmConditionEvaluator.cxx +++ b/Source/cmConditionEvaluator.cxx @@ -663,11 +663,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); } @@ -688,11 +688,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); } |