OLD | NEW |
1 /******************************************************************** | 1 /******************************************************************** |
2 * COPYRIGHT: | 2 * COPYRIGHT: |
3 * Copyright (c) 2002-2012, International Business Machines Corporation and | 3 * Copyright (c) 2002-2014, International Business Machines Corporation and |
4 * others. All Rights Reserved. | 4 * others. All Rights Reserved. |
5 ******************************************************************** | 5 ******************************************************************** |
6 * | 6 * |
7 * @author Mark E. Davis | 7 * @author Mark E. Davis |
8 * @author Vladimir Weinstein | 8 * @author Vladimir Weinstein |
9 */ | 9 */ |
10 | 10 |
11 #include "unicode/utypes.h" | 11 #include "unicode/utypes.h" |
12 | 12 |
13 #if !UCONFIG_NO_NORMALIZATION | 13 #if !UCONFIG_NO_NORMALIZATION |
(...skipping 242 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
256 | 256 |
257 UnicodeString CanonicalIteratorTest::collectionToString(Hashtable *col) { | 257 UnicodeString CanonicalIteratorTest::collectionToString(Hashtable *col) { |
258 UnicodeString result; | 258 UnicodeString result; |
259 | 259 |
260 // Iterate over the Hashtable, then qsort. | 260 // Iterate over the Hashtable, then qsort. |
261 | 261 |
262 UnicodeString **resArray = new UnicodeString*[col->count()]; | 262 UnicodeString **resArray = new UnicodeString*[col->count()]; |
263 int32_t i = 0; | 263 int32_t i = 0; |
264 | 264 |
265 const UHashElement *ne = NULL; | 265 const UHashElement *ne = NULL; |
266 int32_t el = -1; | 266 int32_t el = UHASH_FIRST; |
267 //Iterator it = basic.iterator(); | 267 //Iterator it = basic.iterator(); |
268 ne = col->nextElement(el); | 268 ne = col->nextElement(el); |
269 //while (it.hasNext()) | 269 //while (it.hasNext()) |
270 while (ne != NULL) { | 270 while (ne != NULL) { |
271 //String item = (String) it.next(); | 271 //String item = (String) it.next(); |
272 UnicodeString *item = (UnicodeString *)(ne->value.pointer); | 272 UnicodeString *item = (UnicodeString *)(ne->value.pointer); |
273 resArray[i++] = item; | 273 resArray[i++] = item; |
274 ne = col->nextElement(el); | 274 ne = col->nextElement(el); |
275 } | 275 } |
276 | 276 |
(...skipping 52 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
329 errln("Next after instantiation ("+next+") is different from next after rese
t ("+afterReset+")."); | 329 errln("Next after instantiation ("+next+") is different from next after rese
t ("+afterReset+")."); |
330 } | 330 } |
331 | 331 |
332 logln("Testing getStaticClassID and getDynamicClassID"); | 332 logln("Testing getStaticClassID and getDynamicClassID"); |
333 if(can.getDynamicClassID() != CanonicalIterator::getStaticClassID()){ | 333 if(can.getDynamicClassID() != CanonicalIterator::getStaticClassID()){ |
334 errln("RTTI failed for CanonicalIterator getDynamicClassID != getStaticCla
ssID"); | 334 errln("RTTI failed for CanonicalIterator getDynamicClassID != getStaticCla
ssID"); |
335 } | 335 } |
336 } | 336 } |
337 | 337 |
338 #endif /* #if !UCONFIG_NO_NORMALIZATION */ | 338 #endif /* #if !UCONFIG_NO_NORMALIZATION */ |
OLD | NEW |