diff options
Diffstat (limited to 'Build/source/libs/icu/icu-src/source/i18n/csrsbcs.cpp')
-rw-r--r-- | Build/source/libs/icu/icu-src/source/i18n/csrsbcs.cpp | 7 |
1 files changed, 3 insertions, 4 deletions
diff --git a/Build/source/libs/icu/icu-src/source/i18n/csrsbcs.cpp b/Build/source/libs/icu/icu-src/source/i18n/csrsbcs.cpp index d346af20bb7..cf3634e70de 100644 --- a/Build/source/libs/icu/icu-src/source/i18n/csrsbcs.cpp +++ b/Build/source/libs/icu/icu-src/source/i18n/csrsbcs.cpp @@ -1,6 +1,6 @@ /* ********************************************************************** - * Copyright (C) 2005-2015, International Business Machines + * Copyright (C) 2005-2016, International Business Machines * Corporation and others. All Rights Reserved. ********************************************************************** */ @@ -15,7 +15,6 @@ #define N_GRAM_SIZE 3 #define N_GRAM_MASK 0xFFFFFF -#define ARRAY_SIZE(array) (sizeof array / sizeof array[0]) U_NAMESPACE_BEGIN @@ -892,7 +891,7 @@ UBool CharsetRecog_8859_1::match(InputText *textIn, CharsetMatch *results) const const char *name = textIn->fC1Bytes? "windows-1252" : "ISO-8859-1"; uint32_t i; int32_t bestConfidenceSoFar = -1; - for (i=0; i < ARRAY_SIZE(ngrams_8859_1) ; i++) { + for (i=0; i < UPRV_LENGTHOF(ngrams_8859_1) ; i++) { const int32_t *ngrams = ngrams_8859_1[i].ngrams; const char *lang = ngrams_8859_1[i].lang; int32_t confidence = match_sbcs(textIn, ngrams, charMap_8859_1); @@ -919,7 +918,7 @@ UBool CharsetRecog_8859_2::match(InputText *textIn, CharsetMatch *results) const const char *name = textIn->fC1Bytes? "windows-1250" : "ISO-8859-2"; uint32_t i; int32_t bestConfidenceSoFar = -1; - for (i=0; i < ARRAY_SIZE(ngrams_8859_2) ; i++) { + for (i=0; i < UPRV_LENGTHOF(ngrams_8859_2) ; i++) { const int32_t *ngrams = ngrams_8859_2[i].ngrams; const char *lang = ngrams_8859_2[i].lang; int32_t confidence = match_sbcs(textIn, ngrams, charMap_8859_2); |