ICU-57131.0.1.tar.gz

[apple/icu.git] / icuSources / test / intltest / tstnorm.cpp

diff --git a/icuSources/test/intltest/tstnorm.cpp b/icuSources/test/intltest/tstnorm.cpp
index f9246198f7a8668086e2e4bb07c222a98de739e4..1da0bb4f1f2894a205b88a2913aaee46588e1323 100644 (file)
--- a/icuSources/test/intltest/tstnorm.cpp
+++ b/icuSources/test/intltest/tstnorm.cpp
@@ -1,6 +1,6 @@
 /********************************************************************
  * COPYRIGHT: 
- * Copyright (c) 1997-2014, International Business Machines Corporation and
+ * Copyright (c) 1997-2016, International Business Machines Corporation and
  * others. All Rights Reserved.
  ********************************************************************/
 
@@ -15,6 +15,7 @@
 #include "unicode/usetiter.h"
 #include "unicode/schriter.h"
 #include "unicode/utf16.h"
+#include "cmemory.h"
 #include "cstring.h"
 #include "normalizer2impl.h"
 #include "tstnorm.h"
@@ -349,7 +350,7 @@ void BasicNormalizerTest::TestZeroIndex(void) {
         "c\\u0321\\u0327", "c\\u0321\\u0327", "c\\u0321\\u0327",
         "c\\u0327\\u0321", "\\u00E7\\u0321", "c\\u0327\\u0321",
     };
-    int32_t DATA_length = (int32_t)(sizeof(DATA) / sizeof(DATA[0]));
+    int32_t DATA_length = UPRV_LENGTHOF(DATA);
 
     for (int32_t i=0; i<DATA_length; i+=3) {
         UErrorCode status = U_ZERO_ERROR;
@@ -803,7 +804,7 @@ void BasicNormalizerTest::TestConcatenate() {
     int32_t i;
 
     /* test concatenation */
-    for(i=0; i<(int32_t)(sizeof(cases)/sizeof(cases[0])); ++i) {
+    for(i=0; i<UPRV_LENGTHOF(cases); ++i) {
         switch(*cases[i][0]) {
         case 'C': mode=UNORM_NFC; break;
         case 'D': mode=UNORM_NFD; break;