Update ICU to 54.1 step 1

source/test/perf/convperf/convperf.h

 /*
 **********************************************************************
-* Copyright (c) 2002-2005, International Business Machines
+* Copyright (c) 2002-2014, International Business Machines
 * Corporation and others.  All Rights Reserved.
 **********************************************************************
 **********************************************************************
 */
 #ifndef _CONVPERF_H
 #define _CONVPERF_H
 
 #include <mlang.h>
 #include <objbase.h>
 #include <stdlib.h>
 #include "unicode/ucnv.h"
 #include "unicode/uclean.h"
 #include "unicode/ustring.h"
+#include "cmemory.h" // for UPRV_LENGTHOF
 
 #include "unicode/uperf.h"
 
 #define CONVERSION_FLAGS (0) /*WC_DEFAULTCHAR WC_COMPOSITECHECK & WC_SEPCHARS*/
 #define MAX_BUF_SIZE  3048
-#define LENGTHOF(array) (sizeof(array)/sizeof((array)[0]))
 
 class ICUToUnicodePerfFunction : public UPerfFunction{
 private:
     UConverter* conv;
     const char* src;
     int32_t srcLen;
     UChar* target;
     UChar* targetLimit;
     
 public:
@@ skipping 119 matching lines @@
     char* src; 
     UINT  srcLen;
     WCHAR dest[MAX_BUF_SIZE];
     UINT  dstLen;
     const char* name;
 public:
     WinANSIToUnicodePerfFunction(const char* cpName, char* pszIn,UINT szLen, UErrorCode& status){
         name = cpName;
         src = pszIn;
         srcLen = szLen;
-        dstLen = LENGTHOF(dest);
+        dstLen = UPRV_LENGTHOF(dest);
         unsigned short bEnc[30]={'\0'};
         const char* tenc=name;
         for(int i=0;*tenc!='\0';i++){
             bEnc[i]=*tenc;
             tenc++;
         }
         LPMULTILANGUAGE2 pMulti;
         
         CoInitialize(NULL);
 
@@ skipping 33 matching lines @@
     char dest[MAX_BUF_SIZE];
     UINT  dstLen;
     const char* name;
     BOOL lpUsedDefaultChar;
 
 public:
     WinANSIFromUnicodePerfFunction(const char* cpName,  WCHAR* pszIn,UINT szLen, UErrorCode& status){
         name = cpName;
         src = pszIn;
         srcLen = szLen;
-        dstLen = LENGTHOF(dest);
+        dstLen = UPRV_LENGTHOF(dest);
         lpUsedDefaultChar=FALSE;
         unsigned short bEnc[30]={'\0'};
         const char* tenc=name;
         for(int i=0;*tenc!='\0';i++){
             bEnc[i]=*tenc;
             tenc++;
         }
         LPMULTILANGUAGE2 pMulti;
         
         CoInitialize(NULL);
@@ skipping 74 matching lines @@
         for(int i=0;*tenc!='\0';i++){
             bEnc[i]=*tenc;
             tenc++;
         }
         /* get the charset info */
         pMulti->GetCharsetInfo((wchar_t *)bEnc,&mimeInfo);
         pMulti->CreateConvertCharset(mimeInfo.uiCodePage, 1200 /*unicode*/, (DWORD)0,&pConvToUni);
         getErr(err,status);
         src = source;
         srcLen = sourceLen;
-        dstLen = LENGTHOF(dst);
+        dstLen = UPRV_LENGTHOF(dst);
         cpName = name;
     }
 
     virtual void call(UErrorCode* status){
         HRESULT err= pConvToUni->DoConversionToUnicode(src,&srcLen,dst, &dstLen);
         getErr(err,*status);
     }
     virtual long getOperationsPerIteration(void){
         return srcLen;
     }
@@ skipping 35 matching lines @@
         for(int i=0;*tenc!='\0';i++){
             bEnc[i]=*tenc;
             tenc++;
         }
         /* get the charset info */
         pMulti->GetCharsetInfo((wchar_t *)bEnc,&mimeInfo);
         pMulti->CreateConvertCharset(1200 /*unicode*/, mimeInfo.uiCodePage, (DWORD)0,&pConvFromUni);
         getErr(err,status);
         src = source;
         srcLen = sourceLen;
-        dstLen = LENGTHOF(dst);
+        dstLen = UPRV_LENGTHOF(dst);
         cpName = name;
 
     }
 
     virtual void call(UErrorCode* status){
         HRESULT err= pConvFromUni->DoConversionFromUnicode(src,&srcLen,dst, &dstLen);
         getErr(err,*status);
     }
     virtual long getOperationsPerIteration(void){
         return srcLen;
@@ skipping 19 matching lines @@
         CoCreateInstance(
                           __uuidof(CMultiLanguage),
                           NULL,
                           CLSCTX_SERVER,
                           __uuidof(IMultiLanguage2),
                           (void**)&pMulti
                           );
 
         src = source;
         srcLen = sourceLen;
-        dstLen = LENGTHOF(dst);
+        dstLen = UPRV_LENGTHOF(dst);
         cpName = name;
         unsigned short bEnc[30]={'\0'};
         const char* tenc=name;
         for(int i=0;*tenc!='\0';i++){
             bEnc[i]=*tenc;
             tenc++;
         }
         /* get the charset info */
         MIMECSETINFO mimeInfo;
         mimeInfo.uiCodePage = 0;
@@ skipping 40 matching lines @@
 
 
         unsigned short bEnc[30]={'\0'};
         const char* tenc=name;
         for(int i=0;*tenc!='\0';i++){
             bEnc[i]=*tenc;
             tenc++;
         }
         src = source;
         srcLen = sourceLen;
-        dstLen = LENGTHOF(dst);
+        dstLen = UPRV_LENGTHOF(dst);
         cpName = name;
         /* get the charset info */
         MIMECSETINFO mimeInfo;
         mimeInfo.uiCodePage = 0;
         mimeInfo.uiInternetEncoding =0;
 
         pMulti->GetCharsetInfo((wchar_t *)bEnc,&mimeInfo);
         dwEnc = (mimeInfo.uiInternetEncoding==0)?mimeInfo.uiCodePage:mimeInfo.uiInternetEncoding;
     }
 
@@ skipping 80 matching lines @@
     UPerfFunction* TestICU_ISO2022JP_FromUnicode();
     UPerfFunction* TestWinANSI_ISO2022JP_ToUnicode();
     UPerfFunction* TestWinANSI_ISO2022JP_FromUnicode();
     UPerfFunction* TestWinIML2_ISO2022JP_ToUnicode();
     UPerfFunction* TestWinIML2_ISO2022JP_FromUnicode(); 
 
 };
 
 #endif