Update ICU to 54.1 step 1

source/test/perf/unisetperf/unisetperf.cpp

 /*  
 **********************************************************************
-*   Copyright (C) 2007, International Business Machines
+*   Copyright (C) 2014, International Business Machines
 *   Corporation and others.  All Rights Reserved.
 **********************************************************************
 *   file name:  unisetperf.cpp
 *   encoding:   US-ASCII
 *   tab size:   8 (not used)
 *   indentation:4
 *
 *   created on: 2007jan31
 *   created by: Markus Scherer
 */
 
 #include <stdio.h>
 #include <stdlib.h>
 #include <string.h>
 #include "unicode/uperf.h"
 #include "unicode/uniset.h"
 #include "unicode/unistr.h"
 #include "uoptions.h"
-
-#define LENGTHOF(array) (int32_t)(sizeof(array)/sizeof((array)[0]))
+#include "cmemory.h" // for UPRV_LENGTHOF
 
 // Command-line options specific to unisetperf.
 // Options do not have abbreviations: Force readable command lines.
 // (Using U+0001 for abbreviation characters.)
 enum {
     SET_PATTERN,
     FAST_TYPE,
     UNISETPERF_OPTIONS_COUNT
 };
 
 static UOption options[UNISETPERF_OPTIONS_COUNT]={
     UOPTION_DEF("pattern", '\x01', UOPT_REQUIRES_ARG),
     UOPTION_DEF("type",    '\x01', UOPT_REQUIRES_ARG)
 };
 
 static const char *const unisetperf_usage =
     "\t--pattern   UnicodeSet pattern for instantiation.\n"
     "\t            Default: [:ID_Continue:]\n"
     "\t--type      Type of UnicodeSet: slow fast\n"
     "\t            Default: slow\n";
 
 // Test object with setup data.
 class UnicodeSetPerformanceTest : public UPerfTest {
 public:
     UnicodeSetPerformanceTest(int32_t argc, const char *argv[], UErrorCode &status)
-            : UPerfTest(argc, argv, options, LENGTHOF(options), unisetperf_usage, status),
+            : UPerfTest(argc, argv, options, UPRV_LENGTHOF(options), unisetperf_usage, status),
               utf8(NULL), utf8Length(0), countInputCodePoints(0), spanCount(0) {
         if (U_SUCCESS(status)) {
             UnicodeString pattern=UnicodeString(options[SET_PATTERN].value, -1, US_INV).unescape();
             set.applyPattern(pattern, status);
             prefrozen=set;
             if(0==strcmp(options[FAST_TYPE].value, "fast")) {
                 set.freeze();
             }
 
             int32_t inputLength;
@@ skipping 372 matching lines @@
     }
         
     if (test.run() == FALSE){
         fprintf(stderr, "FAILED: Tests could not be run, please check the "
                                     "arguments.\n");
         return 1;
     }
 
     return 0;
 }