Update ICU to 54.1 step 1

source/test/perf/unisetperf/unisetperf.cpp

Index: source/test/perf/unisetperf/unisetperf.cpp
diff --git a/source/test/perf/unisetperf/unisetperf.cpp b/source/test/perf/unisetperf/unisetperf.cpp
index 36d61c1e193aef931a738abe5a5ef48153decffe..7c4d9bf3a1edb3309134467a2ecd94061ec55f0f 100644
--- a/source/test/perf/unisetperf/unisetperf.cpp
+++ b/source/test/perf/unisetperf/unisetperf.cpp
@@ -1,6 +1,6 @@
 /*  
 **********************************************************************
-*   Copyright (C) 2007, International Business Machines
+*   Copyright (C) 2014, International Business Machines
 *   Corporation and others.  All Rights Reserved.
 **********************************************************************
 *   file name:  unisetperf.cpp
@@ -19,8 +19,7 @@
 #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.
@@ -46,7 +45,7 @@ static const char *const unisetperf_usage =
 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();