Index: source/extra/scrptrun/scrptrun.cpp |
diff --git a/source/extra/scrptrun/scrptrun.cpp b/source/extra/scrptrun/scrptrun.cpp |
index 8d9865155afab8e3a45e240bb2582b9a5872fa96..5b4e5bba928a69dc48f0ce7272580278394ec2b2 100644 |
--- a/source/extra/scrptrun/scrptrun.cpp |
+++ b/source/extra/scrptrun/scrptrun.cpp |
@@ -1,7 +1,7 @@ |
/* |
******************************************************************************* |
* |
- * Copyright (C) 1999-2001, International Business Machines |
+ * Copyright (C) 1999-2016, International Business Machines |
* Corporation and others. All Rights Reserved. |
* |
******************************************************************************* |
@@ -14,10 +14,9 @@ |
#include "unicode/utypes.h" |
#include "unicode/uscript.h" |
+#include "cmemory.h" |
#include "scrptrun.h" |
-#define ARRAY_SIZE(array) (sizeof array / sizeof array[0]) |
- |
const char ScriptRun::fgClassID=0; |
UChar32 ScriptRun::pairedChars[] = { |
@@ -40,7 +39,7 @@ UChar32 ScriptRun::pairedChars[] = { |
0x301a, 0x301b |
}; |
-const int32_t ScriptRun::pairedCharCount = ARRAY_SIZE(pairedChars); |
+const int32_t ScriptRun::pairedCharCount = UPRV_LENGTHOF(pairedChars); |
const int32_t ScriptRun::pairedCharPower = 1 << highBit(pairedCharCount); |
const int32_t ScriptRun::pairedCharExtra = pairedCharCount - pairedCharPower; |