Update ICU to 58.1

source/extra/scrptrun/scrptrun.cpp

Index: source/extra/scrptrun/scrptrun.cpp
diff --git a/source/extra/scrptrun/scrptrun.cpp b/source/extra/scrptrun/scrptrun.cpp
index 8d9865155afab8e3a45e240bb2582b9a5872fa96..bd5105aaa11ff8f2b92338e32cb9319dfb8f33ba 100644
--- a/source/extra/scrptrun/scrptrun.cpp
+++ b/source/extra/scrptrun/scrptrun.cpp
@@ -1,7 +1,9 @@
+// Copyright (C) 2016 and later: Unicode, Inc. and others.
+// License & terms of use: http://www.unicode.org/copyright.html
 /*
  *******************************************************************************
  *
- *   Copyright (C) 1999-2001, International Business Machines
+ *   Copyright (C) 1999-2016, International Business Machines
  *   Corporation and others.  All Rights Reserved.
  *
  *******************************************************************************
@@ -14,10 +16,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 +41,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;