Update ICU to 54.1 step 1

source/test/perf/unisetperf/draft/bitset.cpp

 /*  
 **********************************************************************
-*   Copyright (C) 2007, International Business Machines
+*   Copyright (C) 2014, International Business Machines
 *   Corporation and others.  All Rights Reserved.
 **********************************************************************
 *   file name:  bitset.cpp
 *   encoding:   US-ASCII
 *   tab size:   8 (not used)
 *   indentation:4
 *
 *   created on: 2007jan15
 *   created by: Markus Scherer
 *
 *   Idea for a "compiled", fast, read-only (immutable) version of a UnicodeSet
 *   using a folded bit set consisting of a 1k-entry index table and a
 *   compacted array of 64-bit words.
 *   Uses a simple hash table for compaction.
 *   Uses the original set for supplementary code points.
 */
 
 #include "unicode/utypes.h"
 #include "unicont.h"
+#include "cmemory.h" // for UPRV_LENGTHOF
 
 /*
  * Hash table for up to 1k 64-bit words, for 1 bit per BMP code point.
  * Hashes 64-bit words and maps them to 16-bit integers which are
  * assigned in order of new incoming words for subsequent storage
  * in a contiguous array.
  */
 struct BMPBitHash : public UObject {
     int64_t keys[0x800];  // 2k
     uint16_t values[0x800];
@@ skipping 106 matching lines @@
                         index[i++]=all;
                     } while(i<j);
                 }
                 b=INT64_C(0xffffffffffffffff);
             }
             /* i==j */
             b&=(INT64_C(1)<<(end&0x3f))-1;
             prevIndex=j;
         }
 
-        if(bitHash->countKeys()>LENGTHOF(shortBits)) {
+        if(bitHash->countKeys()>UPRV_LENGTHOF(shortBits)) {
             bits=(int64_t *)uprv_malloc(bitHash->countKeys()*8);
         }
         if(bits!=NULL) {
             bitHash->invert(bits);
         } else {
             bits=shortBits;
             errorCode=U_MEMORY_ALLOCATION_ERROR;
             return;
         }
 
@@ skipping 28 matching lines @@
 
 private:
     uint16_t index[0x400];
     int64_t shortBits[32];
     int64_t *bits;
 
     uint32_t latin1Bits[8];
 
     UnicodeSet *restSet;
 };