ICU-64232.0.1.tar.gz

[apple/icu.git] / icuSources / test / perf / normperf / normperf.cpp

diff --git a/icuSources/test/perf/normperf/normperf.cpp b/icuSources/test/perf/normperf/normperf.cpp
index 011bbcbd3ec71487620b4c607e969da94f938cc8..0cc65b5205c26f5597661e9a91530efd8213402f 100644 (file)
--- a/icuSources/test/perf/normperf/normperf.cpp
+++ b/icuSources/test/perf/normperf/normperf.cpp
@@ -1,9 +1,13 @@
 /*
-**********************************************************************
-* Copyright (c) 2002-2005, International Business Machines
+***********************************************************************
+* © 2016 and later: Unicode, Inc. and others.
+* License & terms of use: http://www.unicode.org/copyright.html#License
+***********************************************************************
+***********************************************************************
+* Copyright (c) 2002-2016, International Business Machines
 * Corporation and others.  All Rights Reserved.
-**********************************************************************
-**********************************************************************
+***********************************************************************
+***********************************************************************
 */
 /** 
  * This Program tests the performance of ICU's Normalization engine against Windows
@@ -13,10 +17,9 @@
  */
 #include "normperf.h"
 #include "uoptions.h"
+#include "cmemory.h" // for UPRV_LENGTHOF
 #include <stdio.h>
 
-#define LENGTHOF(array) (sizeof(array)/sizeof((array)[0]))
-
 UPerfFunction* NormalizerPerformanceTest::runIndexedTest(int32_t index, UBool exec,const char* &name, char* par) {
     switch (index) {
         TESTCASE(0,TestICU_NFC_NFD_Text);
@@ -132,7 +135,7 @@ NormalizerPerformanceTest::NormalizerPerformanceTest(int32_t argc, const char* a
         return;
     }
 
-    _remainingArgc = u_parseArgs(_remainingArgc, (char **)argv, (int32_t)(LENGTHOF(cmdLineOptions)), cmdLineOptions);
+    _remainingArgc = u_parseArgs(_remainingArgc, (char **)argv, UPRV_LENGTHOF(cmdLineOptions), cmdLineOptions);
     if(cmdLineOptions[0].doesOccur && cmdLineOptions[0].value!=NULL) {
         options=(int32_t)strtol(cmdLineOptions[0].value, NULL, 16);
     }