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

ICU-3753 Fix the case when STL set is used.

Browse Source 
X-SVN-Rev: 15296
This commit is contained in:
George Rhoten 2004-05-13 21:21:58 +00:00
parent a07ec0bc42
commit 190cb67d55
2 changed files with 9 additions and 9 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

10
icu4c/source/common/ucnv.c
View File

@ -615,14 +615,14 @@ ucnv_getPlatform (const UConverter * converter,
U_CAPI void U_EXPORT2
ucnv_getUnicodeSet(const UConverter *cnv,
USet *set,
UConverterUnicodeSet which,
USet *setFillIn,
UConverterUnicodeSet whichSet,
UErrorCode *pErrorCode) {
/* argument checking */
if(pErrorCode==NULL || U_FAILURE(*pErrorCode)) {
return;
}
if(cnv==NULL || set==NULL || which<UCNV_ROUNDTRIP_SET || UCNV_SET_COUNT<=which) {
if(cnv==NULL || setFillIn==NULL || whichSet<UCNV_ROUNDTRIP_SET || UCNV_SET_COUNT<=whichSet) {
*pErrorCode=U_ILLEGAL_ARGUMENT_ERROR;
return;
}
@ -634,10 +634,10 @@ ucnv_getUnicodeSet(const UConverter *cnv,
}
/* empty the set */
uset_clear(set);
uset_clear(setFillIn);
/* call the converter to add the code points it supports */
cnv->sharedData->impl->getUnicodeSet(cnv, set, which, pErrorCode);
cnv->sharedData->impl->getUnicodeSet(cnv, setFillIn, whichSet, pErrorCode);
}
U_CAPI void U_EXPORT2

8
icu4c/source/common/unicode/ucnv.h
View File

@ -819,9 +819,9 @@ typedef enum UConverterUnicodeSet {
* sets with different properties.
*
* @param cnv The converter for which a set is requested.
* @param set A valid USet; it will be cleared by the function before
* @param setFillIn A valid USet *. It will be cleared by this function before
* the converter's specific set is filled into the USet.
* @param which A UConverterUnicodeSet selector;
* @param whichSet A UConverterUnicodeSet selector;
* currently UCNV_ROUNDTRIP_SET is the only supported value.
* @param pErrorCode ICU error code in/out parameter.
* Must fulfill U_SUCCESS before the function call.
@ -833,8 +833,8 @@ typedef enum UConverterUnicodeSet {
*/
U_DRAFT void U_EXPORT2
ucnv_getUnicodeSet(const UConverter *cnv,
USet *set,
UConverterUnicodeSet which,
USet *setFillIn,
UConverterUnicodeSet whichSet,
UErrorCode *pErrorCode);
/**