AuroraMiddleware/scuffed-code
1
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity

ICU-7552 change bitwise -> logical ||, &&

Browse Source 
X-SVN-Rev: 27861
This commit is contained in:
Andy Heninger 2010-03-17 22:59:15 +00:00
parent 92ba1e3fde
commit 68443106b1
1 changed files with 3 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
icu4c/source/common/uresbund.c
View File

@ -62,7 +62,7 @@ static UBool U_CALLCONV compareEntries(const UHashTok p1, const UHashTok p2) {
name2.pointer = b2->fName;
path1.pointer = b1->fPath;
path2.pointer = b2->fPath;
return (UBool)(uhash_compareChars(name1, name2) &
return (UBool)(uhash_compareChars(name1, name2) &&
uhash_compareChars(path1, path2));
}
@ -665,7 +665,7 @@ static UResourceDataEntry *entryOpen(const char* path, const char* localeID, UEr
if(!hasRealData) {
r->fBogus = U_USING_DEFAULT_WARNING;
}
hasRealData = (UBool)((t2->fBogus == U_ZERO_ERROR) | hasRealData);
hasRealData = (UBool)((t2->fBogus == U_ZERO_ERROR) || hasRealData);
t1->fParent = t2;
t1 = t2;
}
@ -673,7 +673,7 @@ static UResourceDataEntry *entryOpen(const char* path, const char* localeID, UEr
while(r != NULL && !isRoot && t1->fParent != NULL) {
t1->fParent->fCountExisting++;
t1 = t1->fParent;
hasRealData = (UBool)((t1->fBogus == U_ZERO_ERROR) | hasRealData);
hasRealData = (UBool)((t1->fBogus == U_ZERO_ERROR) || hasRealData);
}
} /* umtx_lock */
finishUnlock: