ICU-66108.tar.gz

[apple/icu.git] / icuSources / test / perf / convperf / convperf.h

diff --git a/icuSources/test/perf/convperf/convperf.h b/icuSources/test/perf/convperf/convperf.h
index a8c47b94e994098defb05373b444860cc398f5fd..cc1e3d5f1ce3cea7ea182630ca3be840d9a74b58 100644 (file)
--- a/icuSources/test/perf/convperf/convperf.h
+++ b/icuSources/test/perf/convperf/convperf.h
@@ -1,9 +1,13 @@
 /*
-**********************************************************************
-* Copyright (c) 2002-2005, International Business Machines
+***********************************************************************
+* © 2016 and later: Unicode, Inc. and others.
+* License & terms of use: http://www.unicode.org/copyright.html#License
+***********************************************************************
+***********************************************************************
+* Copyright (c) 2002-2014, International Business Machines
 * Corporation and others.  All Rights Reserved.
-**********************************************************************
-**********************************************************************
+***********************************************************************
+***********************************************************************
 */
 #ifndef _CONVPERF_H
 #define _CONVPERF_H
@@ -14,12 +18,12 @@
 #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:
@@ -159,7 +163,7 @@ public:
         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++){
@@ -186,7 +190,7 @@ public:
         mimeInfo.uiCodePage = 0;
         mimeInfo.uiInternetEncoding =0;
         /* get the charset info */
-        pMulti->GetCharsetInfo(bEnc,&mimeInfo);
+        pMulti->GetCharsetInfo((wchar_t *)bEnc,&mimeInfo);
         uiCodePage = (mimeInfo.uiInternetEncoding==0)?mimeInfo.uiCodePage:mimeInfo.uiInternetEncoding;
     }
     virtual void call(UErrorCode* status){
@@ -213,7 +217,7 @@ public:
         name = cpName;
         src = pszIn;
         srcLen = szLen;
-        dstLen = LENGTHOF(dest);
+        dstLen = UPRV_LENGTHOF(dest);
         lpUsedDefaultChar=FALSE;
         unsigned short bEnc[30]={'\0'};
         const char* tenc=name;
@@ -240,7 +244,7 @@ public:
         mimeInfo.uiCodePage = 0;
         mimeInfo.uiInternetEncoding =0;
         /* get the charset info */
-        pMulti->GetCharsetInfo(bEnc,&mimeInfo);
+        pMulti->GetCharsetInfo((wchar_t *)bEnc,&mimeInfo);
         uiCodePage = (mimeInfo.uiInternetEncoding==0)?mimeInfo.uiCodePage:mimeInfo.uiInternetEncoding;
     }
     virtual void call(UErrorCode* status){
@@ -303,12 +307,12 @@ public:
             tenc++;
         }
         /* get the charset info */
-        pMulti->GetCharsetInfo(bEnc,&mimeInfo);
+        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;
     }
 
@@ -359,12 +363,12 @@ public:
             tenc++;
         }
         /* get the charset info */
-        pMulti->GetCharsetInfo(bEnc,&mimeInfo);
+        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;
 
     }
@@ -404,7 +408,7 @@ public:
 
         src = source;
         srcLen = sourceLen;
-        dstLen = LENGTHOF(dst);
+        dstLen = UPRV_LENGTHOF(dst);
         cpName = name;
         unsigned short bEnc[30]={'\0'};
         const char* tenc=name;
@@ -416,7 +420,7 @@ public:
         MIMECSETINFO mimeInfo;
         mimeInfo.uiCodePage = 0;
         mimeInfo.uiInternetEncoding =0;
-        pMulti->GetCharsetInfo(bEnc,&mimeInfo);
+        pMulti->GetCharsetInfo((wchar_t *)bEnc,&mimeInfo);
         dwEnc = (mimeInfo.uiInternetEncoding==0)?mimeInfo.uiCodePage:mimeInfo.uiInternetEncoding;
     }
 
@@ -465,14 +469,14 @@ public:
         }
         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(bEnc,&mimeInfo);
+        pMulti->GetCharsetInfo((wchar_t *)bEnc,&mimeInfo);
         dwEnc = (mimeInfo.uiInternetEncoding==0)?mimeInfo.uiCodePage:mimeInfo.uiInternetEncoding;
     }