ICU-57166.0.1.tar.gz

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

diff --git a/icuSources/test/intltest/currcoll.cpp b/icuSources/test/intltest/currcoll.cpp
index 1a9a3eb91d0e40e06fb70bef41b565fdde30bf68..79c260c229a64eccddcfb10bca01440da9570c7f 100644 (file)
--- a/icuSources/test/intltest/currcoll.cpp
+++ b/icuSources/test/intltest/currcoll.cpp
@@ -1,6 +1,6 @@
 /********************************************************************
  * COPYRIGHT: 
- * Copyright (c) 1997-2009, International Business Machines Corporation and
+ * Copyright (c) 1997-2016, International Business Machines Corporation and
  * others. All Rights Reserved.
  ********************************************************************/
 
@@ -28,10 +28,9 @@
 #include "currcoll.h"
 #endif
 
+#include "cmemory.h"
 #include "sfwdchit.h"
 
-#define ARRAY_LENGTH(array) (sizeof array / sizeof array[0])
-
 CollationCurrencyTest::CollationCurrencyTest()
 {
 }
@@ -91,9 +90,9 @@ void CollationCurrencyTest::currencyTest(/*char *par*/)
 
     // Compare each currency symbol against all the
     // currency symbols, including itself
-    for (i = 0; i < ARRAY_LENGTH(currency); i += 1)
+    for (i = 0; i < UPRV_LENGTHOF(currency); i += 1)
     {
-        for (j = 0; j < ARRAY_LENGTH(currency); j += 1)
+        for (j = 0; j < UPRV_LENGTHOF(currency); j += 1)
         {
             UnicodeString source(currency[i], 1);
             UnicodeString target(currency[j], 1);