diff options
| author | tester <tester@knlcst4.ikn.intel.com> | 2009-06-26 16:15:31 +0200 |
|---|---|---|
| committer | tester <tester@knlcst4.ikn.intel.com> | 2009-06-26 16:15:31 +0200 |
| commit | 696305a3d7f08062f9c66425dde3a5a78acda727 (patch) | |
| tree | 3f5bd8e4d4a38eea9091843fb4313ba0d92c3155 | |
| parent | a4a545c92d62987e3f7f6bd23588c14fcddd8a07 (diff) | |
compiler warning: parenthesis in boolean expression
This fixes the following g++ warning:
syncsession.cpp:4257: error: suggest parentheses around && within ||
It's only a warning unless -Werror is used.
| -rw-r--r-- | src/sysync/syncsession.cpp | 16 |
1 files changed, 8 insertions, 8 deletions
diff --git a/src/sysync/syncsession.cpp b/src/sysync/syncsession.cpp index 9d56efa..5c93f3e 100644 --- a/src/sysync/syncsession.cpp +++ b/src/sysync/syncsession.cpp @@ -4254,14 +4254,14 @@ localstatus TSyncSession::checkRemoteSpecifics(SmlDevInfDevInfPtr_t aDevInfP) for(pos=scP->fRemoteRulesList.begin();pos!=scP->fRemoteRulesList.end();pos++) { // compare with devinf (or test for default-rule if aDevInfP is NULL if ( - ((*pos)->fManufacturer.empty() || aDevInfP && strwildcmp(smlPCDataToCharP(aDevInfP->man),(*pos)->fManufacturer.c_str())==0) && - ((*pos)->fModel.empty() || aDevInfP && strwildcmp(smlPCDataToCharP(aDevInfP->mod),(*pos)->fModel.c_str())==0) && - ((*pos)->fOem.empty() || aDevInfP && strwildcmp(smlPCDataToCharP(aDevInfP->oem),(*pos)->fOem.c_str())==0) && - ((*pos)->fFirmwareVers.empty() || aDevInfP && (*pos)->fFirmwareVers==smlPCDataToCharP(aDevInfP->fwv)) && - ((*pos)->fSoftwareVers.empty() || aDevInfP && (*pos)->fSoftwareVers==smlPCDataToCharP(aDevInfP->swv)) && - ((*pos)->fHardwareVers.empty() || aDevInfP && (*pos)->fHardwareVers==smlPCDataToCharP(aDevInfP->hwv)) && - ((*pos)->fDevId.empty() || aDevInfP && (*pos)->fDevId==smlPCDataToCharP(aDevInfP->devid)) && - ((*pos)->fDevTyp.empty() || aDevInfP && (*pos)->fDevTyp==smlPCDataToCharP(aDevInfP->devtyp)) + ((*pos)->fManufacturer.empty() || (aDevInfP && strwildcmp(smlPCDataToCharP(aDevInfP->man),(*pos)->fManufacturer.c_str())==0)) && + ((*pos)->fModel.empty() || (aDevInfP && strwildcmp(smlPCDataToCharP(aDevInfP->mod),(*pos)->fModel.c_str())==0)) && + ((*pos)->fOem.empty() || (aDevInfP && strwildcmp(smlPCDataToCharP(aDevInfP->oem),(*pos)->fOem.c_str())==0)) && + ((*pos)->fFirmwareVers.empty() || (aDevInfP && (*pos)->fFirmwareVers==smlPCDataToCharP(aDevInfP->fwv))) && + ((*pos)->fSoftwareVers.empty() || (aDevInfP && (*pos)->fSoftwareVers==smlPCDataToCharP(aDevInfP->swv))) && + ((*pos)->fHardwareVers.empty() || (aDevInfP && (*pos)->fHardwareVers==smlPCDataToCharP(aDevInfP->hwv))) && + ((*pos)->fDevId.empty() || (aDevInfP && (*pos)->fDevId==smlPCDataToCharP(aDevInfP->devid))) && + ((*pos)->fDevTyp.empty() || (aDevInfP && (*pos)->fDevTyp==smlPCDataToCharP(aDevInfP->devtyp))) ) { // found, apply rules TRemoteRuleConfig *ruleP = *pos; |