Update ICU to 54.1 step 1

source/test/perf/dicttrieperf/dicttrieperf.cpp

 /*  
  **********************************************************************
- *   Copyright (C) 2010-2012, International Business Machines
+ *   Copyright (C) 2010-2014, International Business Machines
  *   Corporation and others.  All Rights Reserved.
  **********************************************************************
  *  file name:  dicttrieperf.cpp
  *  encoding:   US-ASCII
  *  tab size:   8 (not used)
  *  indentation:4
  *
  *  created on: 2010dec09
  *  created by: Markus W. Scherer
  *
@@ skipping 16 matching lines @@
 #include "unicode/ucharstrie.h"
 #include "unicode/ucharstriebuilder.h"
 #include "unicode/uperf.h"
 #include "unicode/utext.h"
 #include "charstr.h"
 #include "package.h"
 #include "toolutil.h"
 #include "ucbuf.h"  // struct ULine
 #include "uoptions.h"
 #include "uvectr32.h"
-
-#define LENGTHOF(array) (int32_t)(sizeof(array)/sizeof((array)[0]))
+#include "cmemory.h" // for UPRV_LENGTHOF
 
 // Test object.
 class DictionaryTriePerfTest : public UPerfTest {
 public:
     DictionaryTriePerfTest(int32_t argc, const char *argv[], UErrorCode &status)
             : UPerfTest(argc, argv, NULL, 0, "", status), numTextLines(0) {
         if(hasFile()) {
             getLines(status);
             for(int32_t i=0; i<numLines; ++i) {
                 // Skip comment lines (start with a character below 'A').
@@ skipping 390 matching lines @@
         const ULine *lines=perf.getCachedLines();
         int32_t numLines=perf.getNumLines();
         for(int32_t i=0; i<numLines; ++i) {
             // Skip comment lines (start with a character below 'A').
             if(lines[i].name[0]<0x41) {
                 continue;
             }
             utext_openUChars(&text, lines[i].name, lines[i].len, pErrorCode);
             int32_t count=0;
             ucharsTrieMatches(*trie, &text, lines[i].len,
-                              lengths, count, LENGTHOF(lengths));
+                              lengths, count, UPRV_LENGTHOF(lengths));
             if(count==0 || lengths[count-1]!=lines[i].len) {
                 fprintf(stderr, "word %ld (0-based) not found\n", (long)i);
             }
         }
     }
 };
 
 class UCharsTrieDictContains : public UCharsTrieDictLookup {
 public:
     UCharsTrieDictContains(const DictionaryTriePerfTest &perfTest)
@@ skipping 128 matching lines @@
         const ULine *lines=perf.getCachedLines();
         int32_t numLines=perf.getNumLines();
         for(int32_t i=0; i<numLines; ++i) {
             // Skip comment lines (start with a character below 'A').
             if(lines[i].name[0]<0x41) {
                 continue;
             }
             utext_openUChars(&text, lines[i].name, lines[i].len, pErrorCode);
             int32_t count=0;
             bytesTrieMatches(*trie, &text, lines[i].len,
-                             lengths, count, LENGTHOF(lengths));
+                             lengths, count, UPRV_LENGTHOF(lengths));
             if(count==0 || lengths[count-1]!=lines[i].len) {
                 fprintf(stderr, "word %ld (0-based) not found\n", (long)i);
             }
         }
     }
 };
 
 class BytesTrieDictContains : public BytesTrieDictLookup {
 public:
     BytesTrieDictContains(const DictionaryTriePerfTest &perfTest)
@@ skipping 98 matching lines @@
         fprintf(stderr, "DictionaryTriePerfTest() failed: %s\n", errorCode.errorName());
         test.usage();
         return errorCode.reset();
     }
     if(!test.run()) {
         fprintf(stderr, "FAILED: Tests could not be run, please check the arguments.\n");
         return -1;
     }
     return 0;
 }