ICU-57132.0.1.tar.gz

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

diff --git a/icuSources/test/perf/collperf/collperf.cpp b/icuSources/test/perf/collperf/collperf.cpp
index 5fda2fcc26c5c76084ce6e4355d188c1057d030c..841c59bc31f5de56fd04cc81e6b2255e9810d641 100644 (file)
--- a/icuSources/test/perf/collperf/collperf.cpp
+++ b/icuSources/test/perf/collperf/collperf.cpp
@@ -1,6 +1,6 @@
 /********************************************************************
 * COPYRIGHT:
 /********************************************************************
 * COPYRIGHT:

-* Copyright (C) 2001-2012 IBM, Inc.   All Rights Reserved.
+* Copyright (C) 2001-2016 IBM, Inc.   All Rights Reserved.

 *
 ********************************************************************/
 
 *
 ********************************************************************/
 


@@ -9,6 +9,7 @@
 #include <locale.h>
 #include <limits.h>
 #include <string.h>
 #include <locale.h>
 #include <limits.h>
 #include <string.h>

+#include "cmemory.h"

 #include "unicode/uperf.h"
 #include "uoptions.h"
 #include "unicode/coll.h"
 #include "unicode/uperf.h"
 #include "uoptions.h"
 #include "unicode/coll.h"


@@ -572,7 +573,7 @@ public:
                 UOPTION_DEF("c_normal", 'n', UOPT_NO_ARG),          // --normal <on | OFF> 
                 UOPTION_DEF("c_strength", 's', UOPT_REQUIRES_ARG),  // --strength <1-5>
         };
                 UOPTION_DEF("c_normal", 'n', UOPT_NO_ARG),          // --normal <on | OFF> 
                 UOPTION_DEF("c_strength", 's', UOPT_REQUIRES_ARG),  // --strength <1-5>
         };

-        int32_t opt_len = (sizeof(options)/sizeof(options[0]));
+        int32_t opt_len = UPRV_LENGTHOF(options);

         enum {i, r,f,a,c,l,n,s};   // The buffer between the option items' order and their references
 
         _remainingArgc = u_parseArgs(_remainingArgc, (char**)argv, opt_len, options);
         enum {i, r,f,a,c,l,n,s};   // The buffer between the option items' order and their references
 
         _remainingArgc = u_parseArgs(_remainingArgc, (char**)argv, opt_len, options);