Merge topic 'preallocate-condition-keywords'

aff4a5fa cmConditionEvaluator: Use pre-allocated keywords in more places
This commit is contained in:
Brad King 2016-04-11 09:38:58 -04:00 committed by CMake Topic Stage
commit 3a556f005d
1 changed files with 4 additions and 4 deletions

View File

@ -663,11 +663,11 @@ bool cmConditionEvaluator::HandleLevel2(cmArgumentList &newArgs,
{ {
result = false; result = false;
} }
else if (*(argP1) == "LESS") else if (*(argP1) == keyLESS)
{ {
result = (lhs < rhs); result = (lhs < rhs);
} }
else if (*(argP1) == "GREATER") else if (*(argP1) == keyGREATER)
{ {
result = (lhs > rhs); result = (lhs > rhs);
} }
@ -688,11 +688,11 @@ bool cmConditionEvaluator::HandleLevel2(cmArgumentList &newArgs,
def2 = this->GetVariableOrString(*argP2); def2 = this->GetVariableOrString(*argP2);
int val = strcmp(def,def2); int val = strcmp(def,def2);
bool result; bool result;
if (*(argP1) == "STRLESS") if (*(argP1) == keySTRLESS)
{ {
result = (val < 0); result = (val < 0);
} }
else if (*(argP1) == "STRGREATER") else if (*(argP1) == keySTRGREATER)
{ {
result = (val > 0); result = (val > 0);
} }