Update ICU to 54.1 step 1

source/test/perf/utfperf/utfperf.cpp

 /*  
  **********************************************************************
- *   Copyright (C) 2002-2007, International Business Machines
+ *   Copyright (C) 2002-2014, International Business Machines
  *   Corporation and others.  All Rights Reserved.
  **********************************************************************
  *   file name:  utfperf.cpp
  *   encoding:   US-ASCII
  *   tab size:   8 (not used)
  *   indentation:4
  *
  *   created on: 2005Nov17
  *   created by: Raymond Yang
  *
  *   Ported from utfper.c created by Markus W. Scherer
  *   Performance test program for Unicode converters
  */
 
 #include <stdio.h>
 #include <stdlib.h>
 #include "unicode/uperf.h"
+#include "cmemory.h" // for UPRV_LENGTHOF
 #include "uoptions.h"
 
-#define LENGTHOF(array) (int32_t)(sizeof(array)/sizeof((array)[0]))
-
 /* definitions and text buffers */
 
 #define INPUT_CAPACITY (1024*1024)
 #define INTERMEDIATE_CAPACITY 4096
 #define INTERMEDIATE_SMALL_CAPACITY 20
 #define PIVOT_CAPACITY 1024
 #define OUTPUT_CAPACITY INPUT_CAPACITY
 
 static char utf8[INPUT_CAPACITY];
 static UChar pivot[INTERMEDIATE_CAPACITY];
@@ skipping 25 matching lines @@
     "\t--charset   Charset for which to test performance, e.g. windows-1251.\n"
     "\t            Default: UTF-8\n"
     "\t--chunk     Length (in bytes) of charset output chunks. [4096]\n"
     "\t--pivot     Length (in UChars) of the UTF-16 pivot buffer, if applicable.\n"
     "\t            [1024]\n";
 
 // Test object.
 class  UtfPerformanceTest : public UPerfTest{
 public:
     UtfPerformanceTest(int32_t argc, const char *argv[], UErrorCode &status)
-            : UPerfTest(argc, argv, options, LENGTHOF(options), utfperf_usage, status) {
+            : UPerfTest(argc, argv, options, UPRV_LENGTHOF(options), utfperf_usage, status) {
         if (U_SUCCESS(status)) {
             charset = options[CHARSET].value;
 
             chunkLength = atoi(options[CHUNK_LENGTH].value);
             if (chunkLength < 1 || OUTPUT_CAPACITY < chunkLength) {
                 fprintf(stderr, "error: chunk length must be 1..%ld\n", (long)OUTPUT_CAPACITY);
                 status = U_ILLEGAL_ARGUMENT_ERROR;
             }
 
             pivotLength = atoi(options[PIVOT_LENGTH].value);
@@ skipping 275 matching lines @@
                                     "arguments.\n");
         return -1;
     }
 
     if (fromUCallbackCount > 0) {
         printf("Number of fromUnicode callback calls in the last iteration: %ld\n", (long)fromUCallbackCount);
     }
 
     return 0;
 }