diff options
| -rw-r--r-- | parameter/SelectionCriterionRule.cpp | 12 | ||||
| -rw-r--r-- | parameter/SelectionCriterionRule.h | 2 |
2 files changed, 7 insertions, 7 deletions
diff --git a/parameter/SelectionCriterionRule.cpp b/parameter/SelectionCriterionRule.cpp index eec88be..bb353bd 100644 --- a/parameter/SelectionCriterionRule.cpp +++ b/parameter/SelectionCriterionRule.cpp @@ -38,10 +38,10 @@ #define base CRule const CSelectionCriterionRule::SMatchingRuleDescription CSelectionCriterionRule::_astMatchesWhen[CSelectionCriterionRule::ENbMatchesWhen] = { - { "Is", false }, - { "IsNot", false }, - { "Includes", true }, - { "Excludes", true } + { "Is", true }, + { "IsNot", true }, + { "Includes", false }, + { "Excludes", false } }; CSelectionCriterionRule::CSelectionCriterionRule() : _pSelectionCriterion(NULL), _eMatchesWhen(CSelectionCriterionRule::EIs), _iMatchValue(0) @@ -156,9 +156,9 @@ bool CSelectionCriterionRule::setMatchesWhen(const string& strMatchesWhen, strin const ISelectionCriterionTypeInterface* pSelectionCriterionType = _pSelectionCriterion->getCriterionType(); // Check compatibility if relevant - if (pSelectionCriterionType->isTypeInclusive() && !pstMatchingRuleDescription->bInclusiveTypeCompatible) { + if (!pSelectionCriterionType->isTypeInclusive() && !pstMatchingRuleDescription->bExclusiveTypeCompatible) { - strError = "Value incompatible with inclusive kind of type"; + strError = "Value incompatible with exclusive kind of type"; return false; } diff --git a/parameter/SelectionCriterionRule.h b/parameter/SelectionCriterionRule.h index 51f22e7..0efa89d 100644 --- a/parameter/SelectionCriterionRule.h +++ b/parameter/SelectionCriterionRule.h @@ -49,7 +49,7 @@ class CSelectionCriterionRule : public CRule struct SMatchingRuleDescription { const char* pcMatchesWhen; - bool bInclusiveTypeCompatible; + bool bExclusiveTypeCompatible; }; public: |