From eea5fa79bb70024bc6ad6a5a9feec05d16d9a5ec Mon Sep 17 00:00:00 2001 From: Peter Edberg Date: Sat, 13 Apr 2013 02:54:22 +0000 Subject: [PATCH] ICU-10070 Misunderstanding, back out r33521 X-SVN-Rev: 33524 --- icu4c/source/test/cintltst/uregiontest.c | 6 ++---- 1 file changed, 2 insertions(+), 4 deletions(-) diff --git a/icu4c/source/test/cintltst/uregiontest.c b/icu4c/source/test/cintltst/uregiontest.c index c548a78faa5..0dc94b1db1c 100644 --- a/icu4c/source/test/cintltst/uregiontest.c +++ b/icu4c/source/test/cintltst/uregiontest.c @@ -387,14 +387,13 @@ static void TestGetContainedRegions() { const URegion *r = uregion_getRegionFromCode(rd->code, &status); if ( U_SUCCESS(status) ) { UEnumeration *containedRegions; - int32_t resultLength = 0; /* bug in uenum_next if this is NULL, only affects some compilers */ const char *crID; if (uregion_getType(r) == URGN_GROUPING) { continue; } containedRegions = uregion_getContainedRegions(r, &status); if (containedRegions) { - while ((crID = uenum_next(containedRegions, &resultLength, &status)) != NULL && U_SUCCESS(status) ) { + while ((crID = uenum_next(containedRegions, NULL, &status)) != NULL && U_SUCCESS(status) ) { const URegion *cr = uregion_getRegionFromCode(crID, &status); const URegion *containingRegion = (cr)? uregion_getContainingRegion(cr) : NULL; if ( !containingRegion || !uregion_isEqualTo(containingRegion, r) ) { @@ -417,14 +416,13 @@ static void TestGetContainedRegionsWithType() { const URegion *r = uregion_getRegionFromCode(rd->code, &status); if ( U_SUCCESS(status) ) { UEnumeration *containedRegions; - int32_t resultLength = 0; /* bug in uenum_next if this is NULL, only affects some compilers */ const char *crID; if (uregion_getType(r) != URGN_CONTINENT) { continue; } containedRegions = uregion_getContainedRegionsOfType(r, URGN_TERRITORY, &status); if (containedRegions) { - while ((crID = uenum_next(containedRegions, &resultLength, &status)) != NULL && U_SUCCESS(status) ) { + while ((crID = uenum_next(containedRegions, NULL, &status)) != NULL && U_SUCCESS(status) ) { const URegion *cr = uregion_getRegionFromCode(crID, &status); const URegion *containingRegion = (cr)? uregion_getContainingRegionOfType(cr, URGN_CONTINENT) : NULL; if ( !containingRegion || !uregion_isEqualTo(containingRegion, r) ) {